<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> f0a057d (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 58c2c0f (Featire specs) ======= ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> 4d1f738 (Manifest_cache true) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= >>>>>>> 4d1f738 (Manifest_cache true) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= ======= >>>>>>> 1772e92 (Manifest_cache true) >>>>>>> f0a057d (Manifest_cache true) >>>>>>> 1622d61 (Manifest_cache true) >>>>>>> 9afd7e6 (Manifest_cache true) Code coverage for Bookstore
loading
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages)
Generated 2022-10-06T17:07:21+03:00
>>>>>>> b832d45 (Featire specs) >>>>>>> 86d584a (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> 78717cc (Manifest_cache true) ======= >>>>>>> 98beee2 (Manifest_cache true) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 385b8df (Manifest_cache true) ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3 (Add login registration pages) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> c5efe8e (Add login registration pages) >>>>>>> e989024 (Add login registration pages)
Generated 2022-10-06T17:07:21+03:00
>>>>>>> b832d45 (Featire specs) >>>>>>> 379a979 (Featire specs) >>>>>>> 490b01d (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) >>>>>>> 4f4ea3f (Featire specs)
Generated 2022-09-06T10:36:10+03:00
======= <<<<<<< HEAD
Generated 2022-09-06T11:37:55+03:00
=======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 752f0c0 (Featire specs) =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> bd8bda4 (Manifest_cache true) =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= ======= >>>>>>> 251144b (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> aa7b40c (Manifest_cache true) =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= >>>>>>> 4f4ea3f (Featire specs) =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 183b6c5 (Manifest_cache true) =======
Generated 2022-09-06T11:37:55+03:00
>>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
Generated 2022-10-06T17:07:21+03:00
>>>>>>> aca90e3 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> 84d0df6 (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 4f4ea3f (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 183b6c5 (Manifest_cache true) =======
Generated 2022-09-06T11:37:55+03:00
>>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3 (Add login registration pages) ======= >>>>>>> 8480924 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 824bb2b (Featire specs) ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= =======
Generated 2022-10-06T17:07:21+03:00
>>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 22ee41c (Add login registration pages) =======
Generated 2022-10-06T17:07:21+03:00
>>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs)
Generated 2022-10-06T17:07:21+03:00
======= ======= >>>>>>> 96aecde (Manifest_cache true)
Generated 2022-10-06T18:57:15+03:00
>>>>>>> 59d75f9 (Featire specs) =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 78717cc (Manifest_cache true) ======= ======= >>>>>>> 009401d (Featire specs) ======= =======
Generated 2022-09-06T11:37:55+03:00
=======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 98beee2 (Manifest_cache true) ======= ======= >>>>>>> 009401d (Featire specs) ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= ======= ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f92 (Add login registration pages) ======= ======= ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3 (Add login registration pages) ======= ======= ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= =======
Generated 2022-09-06T11:37:55+03:00
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024 (Add login registration pages) ======= ======= =======
Generated 2022-10-06T18:33:49+03:00
>>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= ======= =======
Generated 2022-10-06T18:57:15+03:00
>>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 9ec6862 (Add login registration pages) ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= =======
Generated 2022-09-06T11:37:55+03:00
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD =======
Generated 2022-10-06T18:33:49+03:00
>>>>>>> bf554f4 (Rebased) =======
Generated 2022-10-06T18:57:15+03:00
>>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af9 (Add login registration pages) ======= ======= ======= =======
Generated 2022-10-06T18:33:49+03:00
>>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true)
Generated 2022-10-06T18:57:15+03:00
=======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6d (Manifest_cache true) ======= ======= ======= ======= =======
Generated 2022-09-06T11:37:55+03:00
=======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2179316 (Manifest_cache true) ======= ======= ======= ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0e (Featire specs) ======= ======= ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> d245196 (Manifest_cache true)

All Files ( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 557c1b8 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> 78717cc (Manifest_cache true) ======= >>>>>>> 98beee2 (Manifest_cache true) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 385b8df (Manifest_cache true) ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3 (Add login registration pages) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> c5efe8e (Add login registration pages) >>>>>>> e989024 (Add login registration pages) 95.71% >>>>>>> b832d45 (Featire specs) >>>>>>> 379a979 (Featire specs) >>>>>>> 490b01d (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) 95.71% >>>>>>> b832d45 (Featire specs) >>>>>>> 86d584a (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) >>>>>>> 4f4ea3f (Featire specs) 90.68% ======= <<<<<<< HEAD 99.2% ======= 90.68% >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= 99.11% >>>>>>> 752f0c0 (Featire specs) ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) ======= 99.11% >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= ======= >>>>>>> 251144b (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) ======= 99.25% >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) ======= 99.11% >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= >>>>>>> 4f4ea3f (Featire specs) ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) ======= 99.2% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 95.71% >>>>>>> aca90e3 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> 84d0df6 (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 4f4ea3f (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) ======= 99.2% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3 (Add login registration pages) ======= >>>>>>> 8480924 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 824bb2b (Featire specs) ======= ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= ======= 95.71% >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 22ee41c (Add login registration pages) ======= 95.71% >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) 95.71% ======= 99.11% >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= ======= 90.68% >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 78717cc (Manifest_cache true) ======= ======= >>>>>>> 009401d (Featire specs) ======= ======= 99.2% ======= 90.68% >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 98beee2 (Manifest_cache true) ======= ======= >>>>>>> 009401d (Featire specs) ======= ======= 99.11% >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= ======= ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f92 (Add login registration pages) ======= ======= ======= ======= 99.11% >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3 (Add login registration pages) ======= ======= ======= ======= 99.11% >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= ======= ======= 90.68% >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= ======= 99.2% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 99.25% >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024 (Add login registration pages) ======= ======= ======= 69.46% >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= ======= ======= 95.79% >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= ======= ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 9ec6862 (Add login registration pages) ======= ======= 99.11% >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) ======= ======= 99.11% >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= ======= 90.68% >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= 99.2% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= ======= 99.25% >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) ======= 69.46% >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= <<<<<<< HEAD 95.79% <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af9 (Add login registration pages) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= ======= ======= 99.11% >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) 95.79% ======= 99.11% >>>>>>> d0dc1f1 (Featire specs) ======= 90.68% >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6d (Manifest_cache true) ======= ======= ======= ======= ======= 99.2% ======= 90.68% >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2179316 (Manifest_cache true) ======= ======= ======= ======= ======= 99.11% >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0e (Featire specs) ======= ======= ======= ======= ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> d245196 (Manifest_cache true) covered at <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 557c1b8 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> 78717cc (Manifest_cache true) ======= >>>>>>> 98beee2 (Manifest_cache true) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 385b8df (Manifest_cache true) ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3 (Add login registration pages) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> c5efe8e (Add login registration pages) >>>>>>> e989024 (Add login registration pages) 2.92 >>>>>>> b832d45 (Featire specs) >>>>>>> 379a979 (Featire specs) >>>>>>> 490b01d (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) 2.92 >>>>>>> b832d45 (Featire specs) >>>>>>> 86d584a (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) >>>>>>> 4f4ea3f (Featire specs) 1.04 ======= <<<<<<< HEAD 4.05 ======= 1.04 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= 3.92 >>>>>>> 752f0c0 (Featire specs) ======= 1.04 >>>>>>> bd8bda4 (Manifest_cache true) ======= 3.92 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= ======= >>>>>>> 251144b (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) ======= 1.04 >>>>>>> aa7b40c (Manifest_cache true) ======= 3.9 >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) ======= 3.92 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= >>>>>>> 4f4ea3f (Featire specs) ======= 1.04 >>>>>>> 183b6c5 (Manifest_cache true) ======= 4.05 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 2.92 >>>>>>> aca90e3 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> 84d0df6 (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 4f4ea3f (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= 1.04 >>>>>>> 183b6c5 (Manifest_cache true) ======= 4.05 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3 (Add login registration pages) ======= >>>>>>> 8480924 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 824bb2b (Featire specs) ======= ======= 3.9 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= ======= 2.92 >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 22ee41c (Add login registration pages) ======= 2.92 >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) 2.92 ======= 3.92 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= ======= 1.04 >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 78717cc (Manifest_cache true) ======= ======= >>>>>>> 009401d (Featire specs) ======= ======= 4.05 ======= 1.04 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 98beee2 (Manifest_cache true) ======= ======= >>>>>>> 009401d (Featire specs) ======= ======= 3.92 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= ======= 1.04 >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= ======= 1.04 >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= ======= ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f92 (Add login registration pages) ======= ======= ======= ======= 3.92 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= ======= ======= 1.04 >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= ======= 3.9 >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3 (Add login registration pages) ======= ======= ======= ======= 3.92 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= ======= ======= 1.04 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= ======= 4.05 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 3.9 >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024 (Add login registration pages) ======= ======= ======= 0.7 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= ======= ======= 3.03 >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= ======= ======= 1.04 >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= ======= 1.04 >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 9ec6862 (Add login registration pages) ======= ======= 3.92 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= 1.04 >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= 3.9 >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) ======= ======= 3.92 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= ======= 1.04 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= 4.05 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= ======= 3.9 >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) ======= 0.7 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= <<<<<<< HEAD 3.03 <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af9 (Add login registration pages) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= ======= ======= 3.92 >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) 3.03 ======= 3.92 >>>>>>> d0dc1f1 (Featire specs) ======= 1.04 >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6d (Manifest_cache true) ======= ======= ======= ======= ======= 4.05 ======= 1.04 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2179316 (Manifest_cache true) ======= ======= ======= ======= ======= 3.92 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0e (Featire specs) ======= ======= ======= ======= ======= 1.04 >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> d245196 (Manifest_cache true) hits/line )

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> 78717cc (Manifest_cache true) ======= >>>>>>> 98beee2 (Manifest_cache true) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 385b8df (Manifest_cache true) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> 7bc7f9f (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= >>>>>>> 156ffe6 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 6066f92 (Add login registration pages) ======= >>>>>>> adc21e0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= >>>>>>> 84d0df6 (Manifest_cache true) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 793a6ed (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 8249ff3 (Add login registration pages) ======= >>>>>>> 4d90e3d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= >>>>>>> 450f4e3 (Manifest_cache true) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= >>>>>>> c5efe8e (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> e989024 (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= >>>>>>> 160fb15 (Fix) ======= <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> d8dd3b4 (Featire specs) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= >>>>>>> 29e1af9 (Add login registration pages) ======= >>>>>>> 13fca83 (Rebased) ======= >>>>>>> ae884b4 (Fix) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 0341d6d (Manifest_cache true) ======= >>>>>>> 2179316 (Manifest_cache true) ======= >>>>>>> 1ca9c0e (Featire specs) ======= >>>>>>> d245196 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> b719333 (Manifest_cache true) ======= >>>>>>> bf137e4 (Manifest_cache true) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> a304bcf (Manifest_cache true) >>>>>>> b28889f (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) >>>>>>> 4f4ea3f (Featire specs) 34 files in total. ======= <<<<<<< HEAD 47 files in total. >>>>>>> 7375d4b (Manifest_cache true) ======= <<<<<<< HEAD ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD ======= >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> 8480924 (Featire specs) 92 files in total. >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3 (Add login registration pages) ======= ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> e989024 (Add login registration pages) 92 files in total. ======= 47 files in total. >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 98beee2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= ======= 92 files in total. >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> d782a28 (Manifest_cache true) 92 files in total. ======= 47 files in total. >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> d8dd3b4 (Featire specs)
1118 relevant lines, 1070 lines covered and 48 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) 90.68% ======= 99.2% ======= 34 files in total. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= 47 files in total. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= ======= 52 files in total. >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 88d49ad (Add login registration pages)
400 relevant lines, 397 lines covered and ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 8480924 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= 47 files in total. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 52 files in total. >>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD <<<<<<< HEAD 377 relevant lines, 374 lines covered and <<<<<<< HEAD 3 lines missed. ( <<<<<<< HEAD ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= 400 relevant lines, 397 lines covered and >>>>>>> 57a2e05 (Add login registration pages) ======= 400 relevant lines, 397 lines covered and >>>>>>> 824bb2b (Featire specs) 3 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD 99.11% >>>>>>> d0dc1f1 (Featire specs) ======= 90.68% >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 8249ff3 (Add login registration pages) 90.68% >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= 41 files in total. ======= 34 files in total. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= 47 files in total. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= 52 files in total. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages)
400 relevant lines, 397 lines covered and 3 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 29e1af9 (Add login registration pages) 99.11% >>>>>>> 752f0c0 (Featire specs) ======= 90.68% <<<<<<< HEAD ======= ======= 90.68% >>>>>>> 824bb2b (Featire specs) >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= 47 files in total. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= 52 files in total. >>>>>>> e1f4d17 (Add login registration pages)
400 relevant lines, 397 lines covered and 3 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= 47 files in total. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
377 relevant lines, 374 lines covered and 3 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) 99.11% >>>>>>> 752f0c0 (Featire specs) ======= 90.68% <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> bd8bda4 (Manifest_cache true) ======= 41 files in total. ======= 34 files in total. >>>>>>> aa7b40c (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 4e81ea2 (Featire specs) ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) ======= 52 files in total.
400 relevant lines, 397 lines covered and 3 lines missed. ( 99.25% >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= 41 files in total. <<<<<<< HEAD ======= 34 files in total. >>>>>>> 183b6c5 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 08edf50 (Featire specs) ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) ======= 99.2% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 95.71% >>>>>>> aca90e3 (Rebased) =======
338 relevant lines, 335 lines covered and 3 lines missed. ( 99.11% >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) ======= 41 files in total.
338 relevant lines, 335 lines covered and 3 lines missed. ( 99.11% >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) ======= 99.2% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3 (Add login registration pages) ======= >>>>>>> 8480924 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 824bb2b (Featire specs) ======= ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= ======= ======= >>>>>>> 6fa625b (Manifest_cache true) 95.71% <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> 02a399d (Manifest_cache true) ======= 99.2% ======= 34 files in total. >>>>>>> 7375d4b (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD 99.11% >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= ======= 90.68% >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 78717cc (Manifest_cache true) ======= ======= ======= 90.68% >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 98beee2 (Manifest_cache true) ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> bd8bda4 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> aa7b40c (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= ======= ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f92 (Add login registration pages) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3 (Add login registration pages) ======= ======= ======= ======= 41 files in total.
338 relevant lines, 335 lines covered and 3 lines missed. ( 99.11% >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= ======= ======= 90.68% >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= ======= 99.2% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 99.25% >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024 (Add login registration pages) ======= ======= ======= 49 files in total.
370 relevant lines, 257 lines covered and 113 lines missed. ( 69.46% >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= ======= ======= 92 files in total.
1141 relevant lines, 1093 lines covered and 48 lines missed. ( 95.79% >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 22ee41c (Add login registration pages) ======= 95.71% <<<<<<< HEAD >>>>>>> c033601 (Rebased) ======= ======= 41 files in total.
338 relevant lines, 335 lines covered and 3 lines missed. ( 99.11% >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD ======= ======= ======= 90.68% >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= 90.68% >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 6fa625b (Manifest_cache true) ======= ======= 41 files in total.
338 relevant lines, 335 lines covered and 3 lines missed. ( 99.11% >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= ======= ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> bd8bda4 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 752f0c0 (Featire specs) ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> df37394 (Featire specs) ======= 41 files in total. ======= 34 files in total. >>>>>>> aa7b40c (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) ======= ======= 41 files in total. <<<<<<< HEAD ======= 34 files in total. >>>>>>> fd6db03 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= ======= 90.68% >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= 99.2% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= ======= 99.25% >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) ======= 49 files in total.
370 relevant lines, 257 lines covered and 113 lines missed. ( 69.46% >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) 92 files in total. ======= 47 files in total. >>>>>>> 7375d4b (Manifest_cache true)
1141 relevant lines, 1093 lines covered and 48 lines missed. ( <<<<<<< HEAD 95.79% <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) ======= 52 files in total.
400 relevant lines, 397 lines covered and 3 lines missed. ( 99.25% >>>>>>> 1214e1f (Add login registration pages) ======= 41 files in total. ======= 34 files in total. <<<<<<< HEAD >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 02a399d (Manifest_cache true) ======= 99.2% ======= 34 files in total. >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD 99.11% <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= ======= ======= 41 files in total. <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= 34 files in total. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% <<<<<<< HEAD >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af9 (Add login registration pages) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= ======= 90.68% >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6d (Manifest_cache true) ======= ======= ======= ======= ======= 90.68% >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2179316 (Manifest_cache true) ======= ======= ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> bd8bda4 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0e (Featire specs) ======= ======= ======= ======= ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> d245196 (Manifest_cache true) )
<<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD ======= ======= ======= ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD ======= >>>>>>> b28889f (Fix) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 490b01d (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= ======= ======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 75fa7e1 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD ======= ======= ======= ======= >>>>>>> 75fa7e1 (Rebased) ======= >>>>>>> 67ab529 (Fix) <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509ee (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= >>>>>>> 75fa7e1 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 8249ff3 (Add login registration pages) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509ee (Featire specs) ======= >>>>>>> 75fa7e1 (Rebased) ======= >>>>>>> 67ab529 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) >>>>>>> c033601 (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 8480924 (Featire specs) <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 34509ee (Featire specs) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 8249ff3 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= ======= ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> c033601 (Rebased) >>>>>>> 49e8a6c (Rebased) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= <<<<<<< HEAD >>>>>>> 5a2009f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> fc3774f (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) ======= >>>>>>> bf554f4 (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= >>>>>>> 67ab529 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) ======= ======= >>>>>>> 0341d6d (Manifest_cache true) ======= >>>>>>> 1ca9c0e (Featire specs) ======= >>>>>>> d245196 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 1ca9c0e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae884b4 (Fix) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 1ca9c0e (Featire specs) <<<<<<< HEAD ======= >>>>>>> ae884b4 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae2a012 (Manifest_cache true) ======= >>>>>>> ae884b4 (Fix) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 2179316 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae2a012 (Manifest_cache true) ======= ======= >>>>>>> 2179316 (Manifest_cache true) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> 2179316 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 307f31f (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= >>>>>>> 67ab529 (Fix) ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> ae884b4 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> ae2a012 (Manifest_cache true) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> a5d032d (Fix) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 490b01d (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> 5a2009f (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> 5a2009f (Fix) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> aca90e3 (Rebased) ======= <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 4f4ea3f (Featire specs) <<<<<<< HEAD ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 8480924 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) >>>>>>> 6e923b9 (Featire specs) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= >>>>>>> aca90e3 (Rebased) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 160fb15 (Fix) ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) >>>>>>> b28889f (Fix) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 4f4ea3f (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> bf554f4 (Rebased) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) >>>>>>> c033601 (Rebased) >>>>>>> 75fa7e1 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 932dbec (Featire specs) >>>>>>> f136376 (Featire specs) >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 4f4ea3f (Featire specs) ======= >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6d (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0e (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> d245196 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8480924 (Featire specs) ======= >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41e (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> 13fca83 (Rebased) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 1ca9c0e (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 1ca9c0e (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8480924 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509ee (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 365d41e (Featire specs) ======= >>>>>>> c05ee51 (Featire specs) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 1ca9c0e (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 77d62af (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= >>>>>>> 34509ee (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 5a2009f (Fix) ======= >>>>>>> 365d41e (Featire specs) ======= >>>>>>> c05ee51 (Featire specs) ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> ae884b4 (Fix) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 1ca9c0e (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= >>>>>>> 67ab529 (Fix) ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> ae884b4 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509ee (Featire specs) ======= >>>>>>> 75fa7e1 (Rebased) ======= ======= >>>>>>> 13fca83 (Rebased) ======= ======= >>>>>>> 311e9fa (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> d8dd3b4 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) >>>>>>> b28889f (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 5a2009f (Fix) ======= >>>>>>> 8480924 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f92 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) >>>>>>> 8480924 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f92 (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3 (Add login registration pages) ======= ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> e989024 (Add login registration pages) >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= >>>>>>> c033601 (Rebased) ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> a5d032d (Fix) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) ======= ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages) >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> bf137e4 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) >>>>>>> 6066f92 (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 98beee2 (Manifest_cache true) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 88d49ad (Add login registration pages) >>>>>>> 8480924 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9bfbd88 (Featire specs) ======= ======= >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> a5d032d (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= ======= <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> 2179316 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= >>>>>>> 8480924 (Featire specs) ======= >>>>>>> 5a2009f (Fix) ======= >>>>>>> 365d41e (Featire specs) ======= >>>>>>> ae884b4 (Fix) ======= >>>>>>> f136376 (Featire specs) >>>>>>> aca90e3 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> 160fb15 (Fix) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 932dbec (Featire specs) >>>>>>> c033601 (Rebased) ======= ======= <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c033601 (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 6e923b9 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) >>>>>>> 4f4ea3f (Featire specs) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= >>>>>>> 8480924 (Featire specs) ======= >>>>>>> d8abfed (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 78717cc (Manifest_cache true) ======= ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 98beee2 (Manifest_cache true) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6d (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2179316 (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0e (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> d245196 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= >>>>>>> 34509ee (Featire specs) ======= >>>>>>> 75fa7e1 (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 365d41e (Featire specs) ======= >>>>>>> c05ee51 (Featire specs) ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> 13fca83 (Rebased) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 1ca9c0e (Featire specs) ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8480924 (Featire specs) ======= >>>>>>> 13fca83 (Rebased) ======= <<<<<<< HEAD ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 932dbec (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509ee (Featire specs) ======= >>>>>>> 75fa7e1 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 365d41e (Featire specs) ======= >>>>>>> c05ee51 (Featire specs) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 1ca9c0e (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 77d62af (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f92 (Add login registration pages) ======= >>>>>>> 6e923b9 (Featire specs) ======= >>>>>>> 8249ff3 (Add login registration pages) ======= >>>>>>> 34509ee (Featire specs) ======= >>>>>>> e989024 (Add login registration pages) ======= >>>>>>> 75fa7e1 (Rebased) ======= >>>>>>> 8480924 (Featire specs) ======= >>>>>>> d8dd3b4 (Featire specs) ======= >>>>>>> 4f4ea3f (Featire specs) ======= >>>>>>> 365d41e (Featire specs) ======= >>>>>>> c05ee51 (Featire specs) ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> 29e1af9 (Add login registration pages) ======= >>>>>>> 13fca83 (Rebased) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 1ca9c0e (Featire specs) ======= >>>>>>> aca90e3 (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) ======= >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> 793a6ed (Add login registration pages) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> c5efe8e (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f92 (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3 (Add login registration pages) ======= ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024 (Add login registration pages) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 75fa7e1 (Rebased) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f92 (Add login registration pages) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3 (Add login registration pages) ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024 (Add login registration pages) ======= ======= >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= >>>>>>> 311e9fa (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af9 (Add login registration pages) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) >>>>>>> 13fca83 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f92 (Add login registration pages) ======= >>>>>>> 8249ff3 (Add login registration pages) ======= >>>>>>> e989024 (Add login registration pages) ======= >>>>>>> 75fa7e1 (Rebased) ======= >>>>>>> 8480924 (Featire specs) ======= >>>>>>> 4f4ea3f (Featire specs) ======= >>>>>>> 365d41e (Featire specs) ======= >>>>>>> 29e1af9 (Add login registration pages) ======= >>>>>>> 13fca83 (Rebased) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> aca90e3 (Rebased) ======= ======= <<<<<<< HEAD ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 6066f92 (Add login registration pages) ======= >>>>>>> 793a6ed (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 8249ff3 (Add login registration pages) ======= >>>>>>> c5efe8e (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> e989024 (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 365d41e (Featire specs) >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f92 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024 (Add login registration pages) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= ======= ======= >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af9 (Add login registration pages) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= >>>>>>> 34509ee (Featire specs) ======= >>>>>>> 75fa7e1 (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 365d41e (Featire specs) ======= >>>>>>> c05ee51 (Featire specs) ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> 13fca83 (Rebased) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 1ca9c0e (Featire specs) ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509ee (Featire specs) ======= >>>>>>> 75fa7e1 (Rebased) ======= ======= >>>>>>> 13fca83 (Rebased) ======= >>>>>>> f136376 (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f92 (Add login registration pages) ======= >>>>>>> 6e923b9 (Featire specs) ======= >>>>>>> 8249ff3 (Add login registration pages) ======= >>>>>>> 34509ee (Featire specs) ======= >>>>>>> e989024 (Add login registration pages) ======= >>>>>>> 75fa7e1 (Rebased) ======= >>>>>>> 8480924 (Featire specs) ======= >>>>>>> d8dd3b4 (Featire specs) ======= >>>>>>> 4f4ea3f (Featire specs) ======= >>>>>>> 365d41e (Featire specs) ======= >>>>>>> c05ee51 (Featire specs) ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> 29e1af9 (Add login registration pages) ======= >>>>>>> 13fca83 (Rebased) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 1ca9c0e (Featire specs) ======= >>>>>>> aca90e3 (Rebased) ======= ======= <<<<<<< HEAD ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 6066f92 (Add login registration pages) ======= >>>>>>> adc21e0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= >>>>>>> 793a6ed (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 8249ff3 (Add login registration pages) ======= >>>>>>> 4d90e3d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= >>>>>>> c5efe8e (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> e989024 (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> fc3774f (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> c033601 (Rebased) >>>>>>> 6066f92 (Add login registration pages) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) ======= ======= >>>>>>> 311e9fa (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3 (Add login registration pages) ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024 (Add login registration pages) ======= ======= >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af9 (Add login registration pages) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) >>>>>>> 13fca83 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 8249ff3 (Add login registration pages) ======= >>>>>>> e989024 (Add login registration pages) ======= >>>>>>> 75fa7e1 (Rebased) ======= >>>>>>> 4f4ea3f (Featire specs) ======= >>>>>>> 29e1af9 (Add login registration pages) ======= >>>>>>> 13fca83 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f92 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> aca90e3 (Rebased) ======= ======= <<<<<<< HEAD ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 6066f92 (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= >>>>>>> 75fa7e1 (Rebased) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3 (Add login registration pages) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f92 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024 (Add login registration pages) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) ======= >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af9 (Add login registration pages) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f92 (Add login registration pages) ======= >>>>>>> 6e923b9 (Featire specs) ======= >>>>>>> 8249ff3 (Add login registration pages) ======= >>>>>>> 34509ee (Featire specs) ======= >>>>>>> e989024 (Add login registration pages) ======= >>>>>>> 75fa7e1 (Rebased) ======= >>>>>>> 8480924 (Featire specs) ======= >>>>>>> d8dd3b4 (Featire specs) ======= >>>>>>> 4f4ea3f (Featire specs) ======= >>>>>>> 365d41e (Featire specs) ======= >>>>>>> c05ee51 (Featire specs) ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> 29e1af9 (Add login registration pages) ======= >>>>>>> 13fca83 (Rebased) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 1ca9c0e (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> aca90e3 (Rebased) ======= <<<<<<< HEAD ======= ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f92 (Add login registration pages) ======= ======= >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3 (Add login registration pages) ======= ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024 (Add login registration pages) ======= ======= >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af9 (Add login registration pages) ======= ======= ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 22ee41c (Add login registration pages) ======= >>>>>>> df37394 (Featire specs) >>>>>>> 4f4ea3f (Featire specs) <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> cacbab9 (Add login registration pages) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f92 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024 (Add login registration pages) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af9 (Add login registration pages) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> 365d41e (Featire specs) ======= >>>>>>> c05ee51 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> 4f4ea3f (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> d8dd3b4 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= >>>>>>> b28889f (Fix) >>>>>>> 5a2009f (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5a2009f (Fix) >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 78717cc (Manifest_cache true) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 98beee2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 59d75f9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6d (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) >>>>>>> 2179316 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 67ab529 (Fix) ======= >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= >>>>>>> ae884b4 (Fix) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) >>>>>>> ae884b4 (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) >>>>>>> ae884b4 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= >>>>>>> 5a2009f (Fix) ======= >>>>>>> ae884b4 (Fix) ======= >>>>>>> 2179316 (Manifest_cache true) <<<<<<< HEAD ======= ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 98beee2 (Manifest_cache true) ======= >>>>>>> 160fb15 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> bf137e4 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> 7375d4b (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 78717cc (Manifest_cache true) ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 98beee2 (Manifest_cache true) ======= ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> 7375d4b (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= ======= ======= >>>>>>> 7375d4b (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6d (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2179316 (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> d245196 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> 4f4ea3f (Featire specs) ======= >>>>>>> 251144b (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> 5a2009f (Fix) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 251144b (Manifest_cache true) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= ======= >>>>>>> 13fca83 (Rebased) ======= >>>>>>> ae884b4 (Fix) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 0341d6d (Manifest_cache true) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6d (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> d245196 (Manifest_cache true) >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 13fca83 (Rebased) ======= >>>>>>> ae884b4 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509ee (Featire specs) ======= >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6d (Manifest_cache true) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0e (Featire specs) ======= ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> d782a28 (Manifest_cache true) >>>>>>> d245196 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509ee (Featire specs) ======= >>>>>>> 75fa7e1 (Rebased) ======= >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> d8dd3b4 (Featire specs) ======= >>>>>>> 365d41e (Featire specs) ======= >>>>>>> c05ee51 (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 1ca9c0e (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= >>>>>>> 34509ee (Featire specs) ======= >>>>>>> 75fa7e1 (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 365d41e (Featire specs) ======= >>>>>>> c05ee51 (Featire specs) ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> 13fca83 (Rebased) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 1ca9c0e (Featire specs) ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> 4f4ea3f (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) >>>>>>> 4f4ea3f (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 75fa7e1 (Rebased) ======= ======= >>>>>>> 13fca83 (Rebased) ======= >>>>>>> ae884b4 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6d (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2179316 (Manifest_cache true) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0e (Featire specs) ======= ======= ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> d245196 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41e (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> 13fca83 (Rebased) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 1ca9c0e (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 1ca9c0e (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509ee (Featire specs) ======= >>>>>>> 75fa7e1 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 365d41e (Featire specs) ======= >>>>>>> c05ee51 (Featire specs) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 1ca9c0e (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= >>>>>>> 6e923b9 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> 4f4ea3f (Featire specs) ======= >>>>>>> 365d41e (Featire specs) ======= >>>>>>> c05ee51 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6d (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2179316 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0e (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) >>>>>>> d245196 (Manifest_cache true) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) >>>>>>> 4f4ea3f (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> 4f4ea3f (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> c033601 (Rebased) >>>>>>> 9a49b7b (Rebased) <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> d782a28 (Manifest_cache true) >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) >>>>>>> ae884b4 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3 (Add login registration pages) ======= >>>>>>> 34509ee (Featire specs) ======= >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= >>>>>>> e989024 (Add login registration pages) ======= >>>>>>> 75fa7e1 (Rebased) ======= >>>>>>> 8480924 (Featire specs) ======= >>>>>>> 4f4ea3f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> aca90e3 (Rebased) ======= ======= <<<<<<< HEAD ======= >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 793a6ed (Add login registration pages) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> c5efe8e (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 8249ff3 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> bf554f4 (Rebased) >>>>>>> c033601 (Rebased) >>>>>>> 8249ff3 (Add login registration pages) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= >>>>>>> 311e9fa (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) >>>>>>> 4f4ea3f (Featire specs) <<<<<<< HEAD >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 8249ff3 (Add login registration pages) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> d8abfed (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> d8abfed (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 13fca83 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) >>>>>>> b28889f (Fix) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 5507b42 (Featire specs) ======= ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aca90e3 (Rebased) ======= ======= <<<<<<< HEAD ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 8480924 (Featire specs) >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> a5d032d (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f92 (Add login registration pages) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774f (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> 8480924 (Featire specs) ======= >>>>>>> d8dd3b4 (Featire specs) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> 5a2009f (Fix) ======= >>>>>>> ae884b4 (Fix) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 67ab529 (Fix) ======= >>>>>>> 8480924 (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> 5a2009f (Fix) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> ae884b4 (Fix) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> 5a2009f (Fix) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> d8dd3b4 (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 67ab529 (Fix) ======= >>>>>>> 8480924 (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> 5a2009f (Fix) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> ae884b4 (Fix) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> 5a2009f (Fix) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> d8dd3b4 (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 67ab529 (Fix) ======= >>>>>>> 8480924 (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> 5a2009f (Fix) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> ae884b4 (Fix) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> 5a2009f (Fix) ======= >>>>>>> f136376 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> d8dd3b4 (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ca9c0e (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 8480924 (Featire specs) >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> c8da2e3 (Fix) >>>>>>> 5a2009f (Fix) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> c033601 (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b719333 (Manifest_cache true) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> fd6db03 (Manifest_cache true) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9620751 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> c05ee51 (Featire specs) ======= >>>>>>> 251144b (Manifest_cache true) >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> 4f4ea3f (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 311e9fa (Rebased) >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774f (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 78717cc (Manifest_cache true) ======= ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 98beee2 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> d782a28 (Manifest_cache true) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 307f31f (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) ======= ======= ======= >>>>>>> 6fa625b (Manifest_cache true) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6d (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2179316 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0e (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> d245196 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41e (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> 13fca83 (Rebased) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 1ca9c0e (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 1ca9c0e (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509ee (Featire specs) ======= >>>>>>> 75fa7e1 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 365d41e (Featire specs) ======= >>>>>>> c05ee51 (Featire specs) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 1ca9c0e (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs)
File % covered Lines Relevant Lines Lines covered Lines missed Avg. Hits / Line
app/controllers/application_controller.rb100.00 % 2 1app/admin/admin_users.rb 40.00 % 27 20 8 12 0.40
app/admin/authors.rbapp/controllers/application_controller.rb100.00 % 36 22 22 0 1.95app/controllers/application_controller.rb100.00 % 2 1 1app/controllers/books_controller.rb 100.00 % 28 14 14 0 13.8640.91 % 36 22 9 13 0.41100.00 % 36 22 22 0 1.95
app/controllers/home_controller.rb 100.00 % 12 7 7 0 1.86
app/decorators/author_decorator.rb100.00 % 7 4 4 0 1.50
app/decorators/book_decorator.rb 100.00 % 18 10 10 0 12.90
app/decorators/category_decorator.rb 100.00 % 3 2 2 0 1.00
app/decorators/paginating_decorator.rb 100.00 % 3 2 20 1.00
app/admin/books.rb 100.00 %57 41 41 0 2.4977 51 51 0 4.20app/admin/books.rb 100.00 % 77 5111 40 0.2251 0 4.20
app/admin/categories.rb 100.00 % 31 18 18 0 2.17
app/admin/dashboard.rb 42.86 % 14 7 3 44.715.86
app/controllers/application_controller.rb 100.00 % 2 1app/admin/admin_users.rb 40.00 % 27 20 8 12 0.40
app/admin/authors.rb 100.00 % 36 2222 0 1.95app/controllers/application_controller.rb100.00 % 2 1 1app/controllers/books_controller.rb 100.00 % 28 14 14 0 13.869 13 0.4122 0 1.95
app/controllers/home_controller.rb 100.00 % 12 7 7 0 1.86
app/decorators/author_decorator.rb100.00 % 7 4 4 0 1.50
app/decorators/book_decorator.rb 100.00 % 18 10 10 0 12.90
app/decorators/category_decorator.rb 100.00 % 3 2 2 0 1.00
app/decorators/paginating_decorator.rb 100.00 % 3 2 20 1.00
app/admin/books.rb 100.00 % 77 51 51 0 4.20
app/admin/categories.rb 100.00 % 31 18 18 0 2.17
app/admin/dashboard.rb 42.86 % 14 7 3 44.71app/controllers/books_controller.rb 100.00 % 28 14 14 0 13.86app/controllers/books_controller.rb 100.00 % 24 12 12 0 13.500.435.86
app/controllers/home_controller.rb 100.00 % 12 7 7 0 1.86
app/controllers/application_controller.rbapp/decorators/author_decorator.rb100.00 % 7 4 4 0 1.25
app/decorators/book_decorator.rb 90.00 % 18 109 1 0.9010 0 12.90100.00 % 2 1 1app/controllers/application_controller.rb 100.00 % 21 1app/controllers/application_controller.rbapp/decorators/author_decorator.rb100.00 % 7 4 4 01.25
app/decorators/book_decorator.rb 90.00 % 18 10 9 1 0.90
app/decorators/category_decorator.rb 100.00 % 5 2 21 11 10 1.0013.86app/controllers/books_controller.rb 100.00 % 24 12 12 0 13.500.435.86
app/controllers/books_controller.rb93.75 % 31 1693.33 % 3015 113.9414.13app/controllers/books_controller.rb100.00 % 24 12 12 0 13.50
app/controllers/home_controller.rb 100.00 % 12 7 7 06.14
app/controllers/reviews_controller.rb 100.00 % 19 10 10 0 1.30
app/controllers/users_controller.rb 86.67 % 31 15 13 2 2.931.86
app/decorators/author_decorator.rb 100.00 % 7 4 4 0 1.50
app/decorators/book_decorator.rb 100.00 % 23 1212 024.500.90
app/decorators/category_decorator.rb 100.00 % 5 2 2app/controllers/application_controller.rb 100.00 % 2 1 10 1.00
app/decorators/category_decorator.rb 100.00 % 5 2 2app/controllers/application_controller.rbapp/decorators/author_decorator.rb100.00 % 7 4 4 0 1.25app/controllers/books_controller.rb93.75 % 31 16 15 1 13.9493.33 % 30 15 14 1 14.13app/controllers/books_controller.rbapp/controllers/books_controller.rbapp/controllers/books_controller.rb100.00 % 24 12 12 013.5013.8613.50
app/controllers/home_controller.rb 100.00 % 12 7 7 06.14
app/controllers/reviews_controller.rb 100.00 %19 10 10 0 1.3017 9 9 0 1.33
app/controllers/users_controller.rb 86.67 % 31 15 13 2 2.93app/controllers/application_controller.rbapp/decorators/author_decorator.rb100.00 % 7 4 4 0 1.25
app/decorators/book_decorator.rb 90.00 % 18 10 9 1 0.90
app/decorators/category_decorator.rb 100.00 % 5 2 2app/controllers/application_controller.rbapp/decorators/author_decorator.rb100.00 % 7 4 4 0 1.25
app/decorators/book_decorator.rb 90.00 % 18 10 9 1 0.90
app/decorators/category_decorator.rb 100.00 % 5 2 21 10 1.00
app/decorators/author_decorator.rb 100.00 % 7 43 1 0.754 0 1.50
app/decorators/book_decorator.rb90.00 % 18 10 9 1 0.90
app/decorators/category_decorator.rb 100.00 % 5 2 21 1app/controllers/application_controller.rbapp/decorators/author_decorator.rb100.00 % 7 4 4 0 1.25
app/decorators/book_decorator.rb 90.00 % 18 10 9 1 0.90
app/decorators/category_decorator.rb 100.00 % 5 2 21 1app/controllers/application_controller.rb 100.00 % 2 1 10 1.00
app/controllers/books_controller.rb93.33 % 30 15 14 1 14.13app/controllers/books_controller.rbapp/controllers/books_controller.rbapp/controllers/books_controller.rb100.00 % 24 12 12 013.5013.8613.50app/controllers/books_controller.rb93.75 % 31 16 15 1 13.94app/controllers/books_controller.rb100.00 % 24 12 12 0 13.50
app/controllers/home_controller.rb 100.00 % 12 7 7 06.14
app/controllers/reviews_controller.rb 100.00 %17 9 9 0 1.3319 10 10 0 1.30
app/controllers/users_controller.rb 86.67 % 31 15 13 2 2.93
app/decorators/author_decorator.rb100.00 % 7 4 4 01.501.2575.00 % 7 4 3 1 0.75100.00 % 7 4 4 0 1.501.25
app/decorators/book_decorator.rb100.00 %66.67 %100.00 %100.00 %23 1212 024.5012.7090.00 % 18 109 1 0.9010 0 12.90
app/decorators/category_decorator.rb 100.00 %3 2 2 0 1.0012 0 25.6712 0 24.5012 025.6712.7090.00 % 18 10 9 1 0.90
app/decorators/category_decorator.rb 100.00 %3 2 2 0 1.00
app/decorators/paginating_decorator.rb 100.00 % 352 2app/controllers/application_controller.rbapp/decorators/author_decorator.rb100.00 % 7 4 4 0 1.25
app/decorators/book_decorator.rb 90.00 % 18 10 91app/controllers/application_controller.rb 100.00 % 2 1 12 20 1.00
app/controllers/books_controller.rb93.33 % 30 15 14100.00 % 28 1414 0 13.361 14.13app/controllers/books_controller.rbapp/decorators/review_decorator.rb100.00 %7 4 4 0 1.00
app/decorators/user_decorator.rb100.00 % 9 5 5 0 1.401.861.861.86app/controllers/books_controller.rb1.868 4 0.67app/decorators/review_decorator.rb 100.00 % 7 4 4 0 1.00
app/decorators/user_decorator.rb 100.00 % 9 5 5 0 1.401.861.861.861.86
app/helpers/application_helper.rb100.00 %7 4 4 0 4.00
app/helpers/constants.rb 100.00 % 27 21 21 0 1.00
app/interactors/billing_update.rb 87.50 % 14 8 7 1 0.88
app/interactors/shipping_update.rb 87.50 % 14 8 7 1 0.88
app/interactors/user_update.rb 100.00 % 25 13 13 0 3.00
app/models/address.rb100.00 %2412 12 0 13.5013.86
app/controllers/home_controller.rb 100.00 % 12 7 7 0 6.14
app/controllers/reviews_controller.rb 100.00 % 17 9 9 0 1.33
app/controllers/users_controller.rb 86.67 % 31 15 13 2 2.93
app/decorators/author_decorator.rb 100.00 % 7 4 4 0 1.50
app/decorators/book_decorator.rb 100.00 % 23 12 12 012.70
app/decorators/category_decorator.rb 100.00 % 3 2 2 0 1.0024.50
app/decorators/paginating_decorator.rb 100.00 % 3 2 2 07 7 01.00
app/decorators/review_decorator.rb 100.00 % 7 4 4 0 1.00
app/decorators/user_decorator.rb 100.00 % 9 5 5 0 1.40
app/helpers/application_helper.rb 100.00 %5 3 3 0 4.677 4 4 0 4.0075.00 % 7 4 3 1 0.75100.00 %7 4 4 0 4.00
app/helpers/constants.rb 100.00 % 27 21 21 0 1.00
app/interactors/billing_update.rb 87.50 % 14 8 7 1 0.88
app/interactors/shipping_update.rb 87.50 % 14 8 7 1 0.88
app/interactors/user_update.rb 100.00 % 25 13 13 0 3.00
app/models/address.rb 100.00 % 247 7 0100.00 %app/controllers/books_controller.rb 100.00 %2412 12 0 13.5013.86
app/controllers/home_controller.rb 100.00 % 12 7 7 0 1.86
app/decorators/author_decorator.rb 100.00 % 7 4 4 01.251.501.25
app/decorators/book_decorator.rb90.00 % 18 10 9 1 0.90100.00 % 18 10 10 0 12.7090.00 % 18 10 9 1 0.90
app/decorators/category_decorator.rb 100.00 %53 2 2 07 7 01.00
app/decorators/paginating_decorator.rb 100.00 % 352 2 07 7 01.00
app/models/admin_user.rb 100.00 % 6app/helpers/application_helper.rb 100.00 % 32 2app/helpers/application_helper.rbapp/models/admin_user.rb100.00 % 6 4 4app/helpers/application_helper.rb 100.00 % 3 2 2100.00 % 6 4 4app/helpers/application_helper.rb 100.00 % 3 2 2app/helpers/application_helper.rb 100.00 % 3 2 26 4 4app/helpers/application_helper.rb 100.00 % 3 2 26 4 4app/helpers/application_helper.rb 100.00 % 3 2 26 4 4app/helpers/application_helper.rb 100.00 % 3 2 26 4 4app/helpers/application_helper.rb 100.00 % 3 2 26 4 4app/helpers/application_helper.rb 100.00 % 3 2 2app/helpers/application_helper.rb 100.00 % 3 2 26 4 4app/helpers/application_helper.rb 100.00 % 3 2 26 4 4app/helpers/application_helper.rb 100.00 % 3 2 26 4 4app/helpers/application_helper.rb 100.00 % 3 2 20 1.00
app/models/application_record.rb 100.00 % 3 2 2 0 1.00
app/models/author.rb 100.00 %6 4 46 4 47 5 57 5 57 5 57 5 57 5 57 5 57 5 57 5 57 5 50 1.00
app/models/authors_book.rb 100.00 % 6 4 4 0 1.00
app/models/authors_book.rb 100.00 % 6 4 4 0 1.00
app/models/billing.rb 100.00 % 2 1 16 4 4app/models/authors_book.rb 100.00 % 6 4 4 0 1.00
app/models/billing.rb 100.00 % 2 1 10 1.00
app/models/book.rb 100.00 %15 8 8app/models/book.rb 100.00 % 13 9 90 1.00
app/models/books_category.rb 100.00 % 6 4 417 9 917 9 915 8 8app/models/book.rb 100.00 % 13 9 90 1.00
app/models/books_category.rb 100.00 % 6 4 40 1.00
app/models/books_category.rb 100.00 % 6 4 417app/models/book.rb 100.00 % 13app/models/book.rb 100.00 % 139 90 1.00
app/models/books_category.rb 100.00 % 6 4 4 0 1.00
app/models/category.rb 100.00 % 6 4 4 0 1.00
app/models/user.rbapp/models/review.rb100.00 % 16 7 7app/models/user.rb 100.00 % 8 2 2100.00 % 16app/models/user.rb 100.00 % 8 2 2 0 1.00app/models/user.rb 100.00 % 8 2 2app/models/review.rb 100.00 % 16 7 7app/models/review.rb100.00 % 167 7app/models/user.rb 100.00 % 8 2 2 0 1.00app/models/user.rb 100.00 % 8 2 2app/models/review.rb 100.00 % 16app/queries/book_query.rb 87.50 % 15 87 70 1.00
app/queries/book_query.rb 87.50 % 15 8 7 17.507.507.25app/queries/book_query.rb 85.71 % 13 7 6 1 8.147.50
app/queries/book_query.rb 87.50 % 15 877 0 1.001 7.507 1 7.257.25
app/queries/book_query.rb 87.50 % 15 8 7 17.507.50
app/queries/book_query.rb 87.50 % 15 8770 1.001 7.507 1 7.257.25
app/queries/book_query.rb 87.50 % 15 8 7 17.257.25app/queries/book_query.rb 85.71 % 13 7 6 1 8.147.507.25app/models/shipping.rb 100.00 % 2 1 1 0 1.007.257.50app/models/shipping.rb 100.00 % 2 1 1 0 1.00
app/models/user.rb 50.00 % 21 12 6 6 0.50
app/queries/book_query.rb 90.00 % 17 10 9 1 9.30app/queries/book_query.rb 85.71 % 13 7 6 1 8.14
config/application.rb 100.00 % 22 6 6 0 1.00
config/boot.rb 100.00 % 4 3 3 0 1.00
config/environment.rb 100.00 % 5 2 2 0 1.00
config/environments/test.rb 100.00 % 6019 19 0 1.00
config/initializers/active_admin.rb 100.00 % 12 11 1118 1818 1818 1818 1818 1818 1818 1818 1818 180 1.00
config/initializers/application_controller_renderer.rb 100.00 % 8 0 0 0 0.00
config/initializers/assets.rb 100.00 % 14 2 2 0 1.00
config/initializers/backtrace_silencers.rb 100.00 % 8 1 1 0 1.00
config/initializers/content_security_policy.rb 100.00 % 30 0 0 0 0.00
config/initializers/cookies_serializer.rb 100.00 % 5 1 1 0 1.00
config/initializers/devise.rb 100.00 % 20 14 14config/initializers/devise.rb 100.00 % 311 13 1320 14 14config/initializers/devise.rb 100.00 % 311 13 13config/initializers/devise.rb 100.00 % 20 14 14config/initializers/devise.rb 100.00 % 311 13 130 1.00
config/initializers/filter_parameter_logging.rb 100.00 % 6 1 1 0 1.00
config/initializers/inflections.rb 100.00 % 16 0 0 0 0.00
config/initializers/kaminari.rb 100.00 % 3 2 2 0 1.00
config/initializers/mime_types.rb 100.00 % 4 0 0 0 0.00
config/initializers/omniauth.rbconfig/initializers/money.rb100.00 % 3 3 3 0 1.00
config/initializers/omniauth.rb 100.00 % 8 3 3config/initializers/omniauth.rbconfig/initializers/money.rb100.00 % 32 23 3config/initializers/omniauth.rb 100.00 % 3 2 23 30 1.00
config/initializers/omniauth.rb 100.00 % 8 3 3 0 1.00
config/initializers/permissions_policy.rb 100.00 % 11 0 0 0 0.00
config/initializers/wrap_parameters.rb 100.00 % 14 2 2 0 1.50
config/routes.rb 100.00 %7 4 45 3 317 9 95 3 37 4 45 3 37 4 417 9 917 9 917 9 95 3 35 3 35 3 37 4 45 3 37 4 45 3 37 4 417 9 97 4 45 3 37 4 45 3 37 4 417 9 90 1.00
spec/decorators/author_decorator_spec.rb 100.00 % 9 5 5 0 1.60spec/decorators/author_decorator_spec.rb 100.00 % 13 7 7 0 1.29
spec/decorators/book_decorator_spec.rb 100.00 % 36 15 15 01.73
spec/factories/addresses.rb 100.00 % 4 2 2 0 1.001.501.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.461.731.46spec/decorators/book_decorator_spec.rb 100.00 % 27 12 12 0 1.501.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.461.731.731.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.461.731.731.46spec/decorators/book_decorator_spec.rb 100.00 % 27 12 12 0 1.50
spec/factories/admin_users.rbspec/factories/authors.rbspec/factories/addresses.rb 100.00 % 4 2 2 0 1.00
spec/factories/admin_users.rb100.00 % 6 4 4 08.007.007.008.001.008.00
spec/factories/authors.rb 80.00 % 18 108 2 2.50spec/factories/authors.rb 100.00 % 6 4 4 0 1.007 3 0.708 2 2.507 3 0.708 2 2.50
spec/factories/authors_books.rb 100.00 % 6 4 4 0 1.00
spec/factories/billings.rb 100.00 % 10 8 8 01.002.5669.562.5668.002.5668.002.5668.002.5669.561.001.00
spec/factories/books.rb 80.95 % 35 2117 4 45.52spec/factories/books.rb 100.00 % 11 9 9 068.002.5669.562.5668.002.5668.002.5668.002.5669.5668.002.5669.5615 6 0.7117 446.3845.52spec/factories/books.rb 100.00 % 11 9 9 068.0068.002.5669.562.5668.0046.3868.002.5668.002.5669.5668.002.5669.5615 6 0.7117 4 46.38spec/factories/books.rb 100.00 % 11 9 9 068.002.5669.562.562.56
spec/factories/books_categories.rbspec/factories/books_categories.rbspec/factories/books_categories.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_categories.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_categories.rbspec/factories/books_category.rb100.00 % 6 4 4 0 1.00
spec/factories/categories.rb 100.00 % 5 3 3 04.671.001.003.334.674.673.333.333.331.004.674.674.673.333.333.331.004.671.00
spec/factories/users.rbspec/factories/reviews.rb100.00 % 7 5 5spec/factories/users.rbspec/factories/reviews.rb100.00 % 4 2 20 1.00spec/factories/users.rb 100.00 % 4 2 27 5 5spec/factories/reviews.rb100.00 % 7 5 5spec/factories/users.rb 100.00 % 4 2 20 1.00
spec/feature/book_spec.rb 100.00 % 202 105 105 0 2.37
spec/feature/book_spec.rb 100.00 % 202 105 105 0 2.37
spec/feature/home_spec.rb 100.00 % 39 20 20 0 1.05
spec/models/author_spec.rb 100.00 % 15 9 9 0 1.44
spec/models/authors_book_spec.rb 100.00 % 15 9 9 0 1.44
spec/models/book_spec.rb 100.00 % 23 16 16 0 1.69
spec/models/books_category_spec.rb 100.00 % 15 9 9 0 1.44
spec/models/category_spec.rb 100.00 % 14 8 8 0 1.380 1.00
spec/factories/shippings.rb 100.00 % 10 8 8 0 1.00
spec/factories/users.rb 100.00 % 7 5 5 011.00
spec/feature/admin/author_spec.rb 100.00 % 57 31 31 0 1.48
spec/feature/admin/book_spec.rb 100.00 %61 32 32 0 1.4183 43 43 0 1.56
spec/feature/admin/category_spec.rb 100.00 % 48 25 25 0 1.56
spec/feature/billing_spec.rb 73.08 % 42 26 19 7 0.773.333.333.333.33
spec/factories/shippings.rb 100.00 % 10 8 8 0 1.00
spec/factories/users.rb 100.00 % 7 5 5 011.00
spec/feature/admin/author_spec.rb 100.00 % 57 31 31 0 1.48
spec/feature/admin/book_spec.rb 100.00 %61 32 32 0 1.4183 43 43 0 1.56
spec/feature/admin/category_spec.rb 100.00 % 48 25 25 0 1.56
spec/feature/billing_spec.rb 73.08 % 42 26 19 7 0.773.333.333.333.33
spec/factories/users.rb 100.00 % 4 2 2 0 1.003.33
spec/factories/users.rb 100.00 % 4 2 2 0 1.003.33
spec/feature/book_spec.rb 100.00 % 202spec/feature/book_spec.rb 100.00 % 202104 104 0 2.38105 105 0 2.37
spec/feature/home_spec.rb 100.00 %96 49 49 0 1.12
spec/feature/login_spec.rb 100.00 % 35 19 19 0 1.16
spec/feature/new_password_spec.rb 100.00 % 24 13 13 0 1.15
spec/feature/registration_spec.rb 100.00 % 51 29 29 0 1.14
spec/feature/review_spec.rb 100.00 %49 30 30 0 1.6746 28 28 0 1.71
spec/feature/settings_spec.rb 100.00 % 62 34 34 0 1.26
spec/feature/shipping_spec.rb 73.08 % 42 26 19 7 0.77
spec/feature/user_spec.rb 100.00 % 76 42 42 0 1.10
spec/models/admin_user_spec.rb 100.00 % 8 5 5 0 1.4039 20 20 0 1.05
spec/models/author_spec.rb 100.00 %13 8 8 0 1.50
spec/models/authors_book_spec.rb 100.00 % 13 8 8 0 1.50
spec/models/billing_spec.rb 100.00 % 27 20 20 0 1.75
spec/models/book_spec.rb 100.00 % 23 16 16 0 1.75
spec/models/books_category_spec.rb 100.00 % 13 8 8 0 1.50
spec/models/category_spec.rb 100.00 % 12 7 7 0 1.43
spec/models/review_spec.rb 100.00 % 20 14 14 0 1.64
spec/models/shipping_spec.rb 100.00 % 27 20 20 0 1.75
spec/models/user_spec.rb 100.00 %15 9 9 0 1.44
spec/queryes/book_query_spec.rb 100.00 % 77 45 45 01.381.381.001.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.531.53
spec/rails_helper.rb 87.50 % 23 16 14 2 0.881.53spec/models/authors_book_spec.rb 100.00 % 15 9 9 0 1.44
spec/models/book_spec.rb 100.00 % 23 16 16 0 1.69
spec/models/books_category_spec.rb 100.00 % 15 9 9 0 1.44
spec/models/category_spec.rb 100.00 % 14 8 8 0 1.381.001.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.001.00
spec/rails_helper.rb 87.50 % 23 16 14 2 0.881.001.00
spec/support/configs/capybara.rb100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %36.84 % 29 19 7 12 0.37100.00 % 29100.00 % 30100.00 % 30100.00 % 3019 19 0 1.0036.84 % 29 19 7 12 0.37100.00 % 30 19 19 0 1.00100.00 % 30 19 19 0 1.0036.84 % 29 19 7 12 0.3736.84 % 29 19 7 12 0.3736.84 % 29 19 7 12 0.37100.00 %293036.84 % 29191919 0 1.007 12 0.377 12 0.3719 0 1.0036.84 % 29 19 7 12 0.37100.00 % 30 19 19 0 1.0036.84 % 29 19 7 12 0.37100.00 %36.84 % 29 19 7 12 0.37100.00 % 29 1919 0 1.0036.84 % 29 19 7 12 0.37100.00 % 29 19 19 0 1.00100.00 % 29 19 19 0 1.007 12 0.377 12 0.377 12 0.3719 0 1.0036.84 % 29 19 7 12 0.37100.00 % 30 19 19 0 1.0036.84 % 29 19 7 12 0.3736.84 % 29 19 7 12 0.37100.00 %293036.84 % 291919 0 1.0036.84 % 29 19 7 12 0.37100.00 % 29 19 19 0 1.00100.00 % 29 19 19 0 1.007 12 0.37
spec/support/configs/shoulda_matcher.rb 100.00 %88899999899999895 5 0 1.00
<<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true)

app/admin/admin_users.rb

40.0% lines covered

20 relevant lines. 8 lines covered and 12 lines missed.
    
  1. 1 ActiveAdmin.register AdminUser do
  2. 1 permit_params :email, :password, :password_confirmation
  3. 1 index do
  4. selectable_column
  5. id_column
  6. column :email
  7. column :current_sign_in_at
  8. column :sign_in_count
  9. column :created_at
  10. actions
  11. end
  12. 1 filter :email
  13. 1 filter :current_sign_in_at
  14. 1 filter :sign_in_count
  15. 1 filter :created_at
  16. 1 form do |f|
  17. f.inputs do
  18. f.input :email
  19. f.input :password
  20. f.input :password_confirmation
  21. end
  22. f.actions
  23. end
  24. end

app/admin/authors.rb

100.0% lines covered

22 relevant lines. 22 lines covered and 0 lines missed.
    
  1. 1 ActiveAdmin.register Author do
  2. 1 config.filters = true
  3. 1 permit_params :first_name, :last_name
  4. 1 filter :books, collection: Book.all
  5. 1 filter :first_name
  6. 1 filter :last_name
  7. 1 index do
  8. 3 selectable_column
  9. 3 column :first_name
  10. 3 column :last_name
  11. 3 actions
  12. end
  13. 1 show do
  14. 3 attributes_table do
  15. 3 row :first_name
  16. 3 row :last_name
  17. 3 row :books
  18. end
  19. end
  20. 1 form do |f|
  21. 2 f.inputs do
  22. 2 f.input :first_name
  23. 2 f.input :last_name
  24. 2 f.input :books, as: :select, collection: Book.all
  25. end
  26. 2 f.actions
  27. end
  28. end

app/admin/books.rb

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD 41 relevant lines. 41 lines covered and ======= 51 relevant lines. 51 lines covered and >>>>>>> b28889f (Fix) 0 lines missed. ======= 51 relevant lines. <<<<<<< HEAD 11 lines covered and 40 lines missed. >>>>>>> 49e8a6c (Rebased) ======= 51 lines covered and 0 lines missed. >>>>>>> 872e675 (Fix)
    
  1. 1 ActiveAdmin.register Book do
  2. 1 permit_params :title, :description, :price_cents, :dimensions, :year_of_publication, :materials, :quantity,
  3. author_ids: [], category_ids: [], images: []
  4. 1 decorate_with BookDecorator
  5. 1 filter :authors, collection: AuthorDecorator.decorate_collection(Author.all)
  6. 1 filter :categories
  7. 1 filter :title
  8. 1 filter :year_of_publication
  9. 1 index do
  10. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  11. 4 =======
  12. 6 >>>>>>> b28889f (Fix) =======
  13. >>>>>>> 49e8a6c (Rebased) =======
  14. 6 >>>>>>> 872e675 (Fix) selectable_column
  15. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  16. 4 =======
  17. 6 =======
  18. >>>>>>> 49e8a6c (Rebased) =======
  19. 6 >>>>>>> 872e675 (Fix) column :categories, &:categories_names
  20. <<<<<<< HEAD <<<<<<< HEAD
  21. 6 >>>>>>> b28889f (Fix) =======
  22. >>>>>>> 49e8a6c (Rebased) =======
  23. 6 >>>>>>> 872e675 (Fix) column :title
  24. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  25. 4 =======
  26. 6 >>>>>>> b28889f (Fix) column :year_of_publication
  27. <<<<<<< HEAD
  28. 4 =======
  29. 6 >>>>>>> b28889f (Fix) column :materials
  30. <<<<<<< HEAD
  31. 4 =======
  32. 6 >>>>>>> b28889f (Fix) column :dimensions
  33. <<<<<<< HEAD
  34. 4 column :price_cents, &:price
  35. 4 =======
  36. 6 >>>>>>> b28889f (Fix) column :quantity
  37. 4 =======
  38. >>>>>>> 49e8a6c (Rebased) =======
  39. 6 >>>>>>> 872e675 (Fix) column :authors, &:authors_names
  40. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  41. 4 =======
  42. 6 >>>>>>> b28889f (Fix) =======
  43. >>>>>>> 49e8a6c (Rebased) =======
  44. 6 >>>>>>> 872e675 (Fix) column :description
  45. 6 column :price, &:price
  46. 6 column :quantity
  47. 6 actions
  48. end
  49. 1 show do
  50. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  51. 3 =======
  52. 5 >>>>>>> b28889f (Fix) =======
  53. >>>>>>> 49e8a6c (Rebased) =======
  54. 5 >>>>>>> 872e675 (Fix) attributes_table do
  55. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  56. 3 =======
  57. 5 >>>>>>> b28889f (Fix) =======
  58. >>>>>>> 49e8a6c (Rebased) =======
  59. 5 >>>>>>> 872e675 (Fix) row :authors, &:authors_names
  60. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  61. 3 =======
  62. 5 >>>>>>> b28889f (Fix) =======
  63. >>>>>>> 49e8a6c (Rebased) =======
  64. 5 >>>>>>> 872e675 (Fix) row :categories, &:categories_names
  65. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  66. 3 =======
  67. 5 >>>>>>> b28889f (Fix) =======
  68. >>>>>>> 49e8a6c (Rebased) =======
  69. 5 >>>>>>> 872e675 (Fix) row :year_of_publication
  70. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  71. 3 =======
  72. 5 >>>>>>> b28889f (Fix) =======
  73. >>>>>>> 49e8a6c (Rebased) =======
  74. 5 >>>>>>> 872e675 (Fix) row :description
  75. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  76. 3 =======
  77. 5 >>>>>>> b28889f (Fix) =======
  78. >>>>>>> 49e8a6c (Rebased) =======
  79. 5 >>>>>>> 872e675 (Fix) row :materials
  80. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  81. 3 =======
  82. 5 >>>>>>> b28889f (Fix) =======
  83. >>>>>>> 49e8a6c (Rebased) =======
  84. 5 >>>>>>> 872e675 (Fix) row :dimensions
  85. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  86. 3 =======
  87. 5 >>>>>>> b28889f (Fix) =======
  88. >>>>>>> 49e8a6c (Rebased) =======
  89. 5 >>>>>>> 872e675 (Fix) row :price, &:price
  90. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  91. 3 =======
  92. 5 >>>>>>> b28889f (Fix) =======
  93. >>>>>>> 49e8a6c (Rebased) =======
  94. 5 >>>>>>> 872e675 (Fix) row :created_at
  95. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  96. 3 =======
  97. 5 >>>>>>> b28889f (Fix) =======
  98. >>>>>>> 49e8a6c (Rebased) =======
  99. 5 >>>>>>> 872e675 (Fix) row :updated_at
  100. end
  101. <<<<<<< HEAD <<<<<<< HEAD
  102. =======
  103. 5 <<<<<<< HEAD panel :images do
  104. 5 table do
  105. 5 book.images.each do |image|
  106. 2 span image_tag image.variant(resize_to_limit: [100, 100])
  107. end
  108. end
  109. end
  110. >>>>>>> b28889f (Fix) end
  111. =======
  112. >>>>>>> 49e8a6c (Rebased)
  113. ======= >>>>>>> 872e675 (Fix) panel :images do
  114. 5 table do
  115. 5 book.images.each do |image|
  116. 2 span image_tag image.variant(resize_to_limit: [100, 100])
  117. end
  118. end
  119. end
  120. end
  121. 1 form do |f|
  122. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  123. 2 =======
  124. 6 >>>>>>> b28889f (Fix) =======
  125. >>>>>>> 49e8a6c (Rebased) =======
  126. 6 >>>>>>> 872e675 (Fix) f.inputs do
  127. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  128. 2 =======
  129. 6 >>>>>>> b28889f (Fix) =======
  130. >>>>>>> 49e8a6c (Rebased) =======
  131. 6 >>>>>>> 872e675 (Fix) f.input :title
  132. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  133. 2 =======
  134. 6 =======
  135. >>>>>>> 49e8a6c (Rebased) =======
  136. 6 >>>>>>> 872e675 (Fix) f.input :description
  137. <<<<<<< HEAD <<<<<<< HEAD
  138. 6 >>>>>>> b28889f (Fix) =======
  139. >>>>>>> 49e8a6c (Rebased) =======
  140. 6 >>>>>>> 872e675 (Fix) f.input :year_of_publication
  141. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  142. 2 =======
  143. 6 >>>>>>> b28889f (Fix) =======
  144. >>>>>>> 49e8a6c (Rebased) =======
  145. 6 >>>>>>> 872e675 (Fix) f.input :price_cents
  146. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  147. 2 =======
  148. 6 >>>>>>> b28889f (Fix) =======
  149. >>>>>>> 49e8a6c (Rebased) =======
  150. 6 >>>>>>> 872e675 (Fix) f.input :materials
  151. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  152. 2 =======
  153. 6 >>>>>>> b28889f (Fix) =======
  154. >>>>>>> 49e8a6c (Rebased) =======
  155. 6 >>>>>>> 872e675 (Fix) f.input :dimensions
  156. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  157. 2 =======
  158. 6 >>>>>>> b28889f (Fix) =======
  159. >>>>>>> 49e8a6c (Rebased) =======
  160. 6 >>>>>>> 872e675 (Fix) f.input :quantity
  161. <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 49e8a6c (Rebased)
  162. <<<<<<< HEAD <<<<<<< HEAD
  163. 6 =======
  164. >>>>>>> 49e8a6c (Rebased) =======
  165. 6 >>>>>>> 872e675 (Fix) f.input :categories, as: :select, collection: Category.all
  166. <<<<<<< HEAD <<<<<<< HEAD
  167. 6 =======
  168. >>>>>>> 49e8a6c (Rebased) =======
  169. 6 >>>>>>> 872e675 (Fix) f.input :authors, as: :select, collection: AuthorDecorator.decorate_collection(Author.all)
  170. <<<<<<< HEAD <<<<<<< HEAD
  171. 6 =======
  172. >>>>>>> 49e8a6c (Rebased) =======
  173. 6 >>>>>>> 872e675 (Fix) f.input :images, as: :file, input_html: { multiple: true }
  174. end
  175. <<<<<<< HEAD <<<<<<< HEAD
  176. 6 =======
  177. >>>>>>> 49e8a6c (Rebased) =======
  178. 6 >>>>>>> 872e675 (Fix) panel :images do
  179. <<<<<<< HEAD <<<<<<< HEAD
  180. 6 =======
  181. >>>>>>> 49e8a6c (Rebased) =======
  182. 6 >>>>>>> 872e675 (Fix) f.object.images.each do |image|
  183. <<<<<<< HEAD <<<<<<< HEAD
  184. 1 =======
  185. >>>>>>> 49e8a6c (Rebased) =======
  186. 1 >>>>>>> 872e675 (Fix) span image_tag image.variant(resize_to_limit: [100, 100])
  187. <<<<<<< HEAD <<<<<<< HEAD
  188. 1 =======
  189. >>>>>>> 49e8a6c (Rebased) =======
  190. 1 >>>>>>> 872e675 (Fix) span link_to('Delete', delete_image_admin_book_path(image.id), method: :delete,
  191. data: { confirm: "Delete #{image.filename}?" })
  192. end
  193. end
  194. <<<<<<< HEAD <<<<<<< HEAD
  195. 6 =======
  196. >>>>>>> 49e8a6c (Rebased) =======
  197. 6 >>>>>>> 872e675 (Fix) f.actions
  198. <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 49e8a6c (Rebased) end
  199. <<<<<<< HEAD <<<<<<< HEAD
  200. ======= ======= >>>>>>> 49e8a6c (Rebased)
  201. 1 member_action :delete_image, method: :delete do
  202. <<<<<<< HEAD <<<<<<< HEAD
  203. 1 =======
  204. >>>>>>> 49e8a6c (Rebased) =======
  205. 1 >>>>>>> 872e675 (Fix) ActiveStorage::Attachment.find(params[:id]).destroy
  206. <<<<<<< HEAD <<<<<<< HEAD
  207. 1 =======
  208. >>>>>>> 49e8a6c (Rebased) =======
  209. 1 >>>>>>> 872e675 (Fix) redirect_back(fallback_location: edit_admin_book_path)
  210. end
  211. <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 49e8a6c (Rebased) end

app/admin/categories.rb

100.0% lines covered

18 relevant lines. 18 lines covered and 0 lines missed.
    
  1. 1 ActiveAdmin.register Category do
  2. 1 permit_params :name, book_ids: []
  3. 1 filter :books, collection: Book.all
  4. 1 filter :name
  5. 1 index do
  6. 4 selectable_column
  7. 4 column :name
  8. 4 actions
  9. end
  10. 1 show do
  11. 3 attributes_table do
  12. 3 row :name
  13. 3 row :created_at
  14. 3 row :updated_at
  15. end
  16. end
  17. 1 form do |f|
  18. 2 f.inputs do
  19. 2 f.input :name
  20. 2 f.input :books, as: :select, collection: Book.all
  21. end
  22. 2 f.actions
  23. end
  24. end

app/admin/dashboard.rb

42.86% lines covered

7 relevant lines. 3 lines covered and 4 lines missed.
    
  1. # frozen_string_literal: true
  2. 1 ActiveAdmin.register_page 'Dashboard' do
  3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  4. 31 =======
  5. 39 >>>>>>> b28889f (Fix) =======
  6. 1 >>>>>>> 49e8a6c (Rebased) =======
  7. 39 >>>>>>> 872e675 (Fix) menu priority: 1, label: proc { I18n.t('active_admin.dashboard') }
  8. 1 content title: proc { I18n.t('active_admin.dashboard') } do
  9. div class: 'blank_slate_container', id: 'dashboard_default_message' do
  10. span class: 'blank_slate' do
  11. span I18n.t('active_admin.dashboard_welcome.welcome')
  12. small I18n.t('active_admin.dashboard_welcome.call_to_action')
  13. end
  14. end
  15. end
  16. end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= >>>>>>> 6e923b9 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 75fa7e1 (Rebased)

app/admin/admin_users.rb

40.0% lines covered

20 relevant lines. 8 lines covered and 12 lines missed.
    
  1. 1 ActiveAdmin.register AdminUser do
  2. 1 permit_params :email, :password, :password_confirmation
  3. 1 index do
  4. selectable_column
  5. id_column
  6. column :email
  7. column :current_sign_in_at
  8. column :sign_in_count
  9. column :created_at
  10. actions
  11. end
  12. 1 filter :email
  13. 1 filter :current_sign_in_at
  14. 1 filter :sign_in_count
  15. 1 filter :created_at
  16. 1 form do |f|
  17. f.inputs do
  18. f.input :email
  19. f.input :password
  20. f.input :password_confirmation
  21. end
  22. f.actions
  23. end
  24. end

app/admin/authors.rb

100.0% lines covered

22 relevant lines. 22 lines covered and 0 lines missed.
    
  1. 1 ActiveAdmin.register Author do
  2. 1 config.filters = true
  3. 1 permit_params :first_name, :last_name
  4. 1 filter :books, collection: Book.all
  5. 1 filter :first_name
  6. 1 filter :last_name
  7. 1 index do
  8. 3 selectable_column
  9. 3 column :first_name
  10. 3 column :last_name
  11. 3 actions
  12. end
  13. 1 show do
  14. 3 attributes_table do
  15. 3 row :first_name
  16. 3 row :last_name
  17. 3 row :books
  18. end
  19. end
  20. 1 form do |f|
  21. 2 f.inputs do
  22. 2 f.input :first_name
  23. 2 f.input :last_name
  24. 2 f.input :books, as: :select, collection: Book.all
  25. end
  26. 2 f.actions
  27. end
  28. end

app/admin/books.rb

100.0% lines covered

51 relevant lines. 51 lines covered and 0 lines missed.
    
  1. 1 ActiveAdmin.register Book do
  2. 1 permit_params :title, :description, :price_cents, :dimensions, :year_of_publication, :materials, :quantity,
  3. author_ids: [], category_ids: [], images: []
  4. 1 decorate_with BookDecorator
  5. 1 filter :authors, collection: AuthorDecorator.decorate_collection(Author.all)
  6. 1 filter :categories
  7. 1 filter :title
  8. 1 filter :year_of_publication
  9. 1 index do
  10. 6 selectable_column
  11. 6 column :categories, &:categories_names
  12. 6 column :title
  13. 6 column :authors, &:authors_names
  14. 6 column :description
  15. 6 column :price, &:price
  16. 6 column :quantity
  17. 6 actions
  18. end
  19. 1 show do
  20. 5 attributes_table do
  21. 5 row :authors, &:authors_names
  22. 5 row :categories, &:categories_names
  23. 5 row :year_of_publication
  24. 5 row :description
  25. 5 row :materials
  26. 5 row :dimensions
  27. 5 row :price, &:price
  28. 5 row :created_at
  29. 5 row :updated_at
  30. end
  31. 5 panel :images do
  32. 5 table do
  33. 5 book.images.each do |image|
  34. 2 span image_tag image.variant(resize_to_limit: [100, 100])
  35. end
  36. end
  37. end
  38. end
  39. 1 form do |f|
  40. 6 f.inputs do
  41. 6 f.input :title
  42. 6 f.input :description
  43. 6 f.input :year_of_publication
  44. 6 f.input :price_cents
  45. 6 f.input :materials
  46. 6 f.input :dimensions
  47. 6 f.input :quantity
  48. 6 f.input :categories, as: :select, collection: Category.all
  49. 6 f.input :authors, as: :select, collection: AuthorDecorator.decorate_collection(Author.all)
  50. 6 f.input :images, as: :file, input_html: { multiple: true }
  51. end
  52. 6 panel :images do
  53. 6 f.object.images.each do |image|
  54. 1 span image_tag image.variant(resize_to_limit: [100, 100])
  55. 1 span link_to('Delete', delete_image_admin_book_path(image.id), method: :delete,
  56. data: { confirm: "Delete #{image.filename}?" })
  57. end
  58. end
  59. 6 f.actions
  60. end
  61. 1 member_action :delete_image, method: :delete do
  62. 1 ActiveStorage::Attachment.find(params[:id]).destroy
  63. 1 redirect_back(fallback_location: edit_admin_book_path)
  64. end
  65. end

app/admin/categories.rb

100.0% lines covered

18 relevant lines. 18 lines covered and 0 lines missed.
    
  1. 1 ActiveAdmin.register Category do
  2. 1 permit_params :name, book_ids: []
  3. 1 filter :books, collection: Book.all
  4. 1 filter :name
  5. 1 index do
  6. 4 selectable_column
  7. 4 column :name
  8. 4 actions
  9. end
  10. 1 show do
  11. 3 attributes_table do
  12. 3 row :name
  13. 3 row :created_at
  14. 3 row :updated_at
  15. end
  16. end
  17. 1 form do |f|
  18. 2 f.inputs do
  19. 2 f.input :name
  20. 2 f.input :books, as: :select, collection: Book.all
  21. end
  22. 2 f.actions
  23. end
  24. end

app/admin/dashboard.rb

42.86% lines covered

7 relevant lines. 3 lines covered and 4 lines missed.
    
  1. # frozen_string_literal: true
  2. 1 ActiveAdmin.register_page 'Dashboard' do
  3. 39 menu priority: 1, label: proc { I18n.t('active_admin.dashboard') }
  4. 1 content title: proc { I18n.t('active_admin.dashboard') } do
  5. div class: 'blank_slate_container', id: 'dashboard_default_message' do
  6. span class: 'blank_slate' do
  7. span I18n.t('active_admin.dashboard_welcome.welcome')
  8. small I18n.t('active_admin.dashboard_welcome.call_to_action')
  9. end
  10. end
  11. end
  12. end
<<<<<<< HEAD <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= ======= >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 98beee2 (Manifest_cache true) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2179316 (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs)

app/controllers/application_controller.rb

100.0% lines covered

1 relevant lines. 1 lines covered and 0 lines missed.
    
  1. 1 class ApplicationController < ActionController::Base
  2. end
<<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix)

app/controllers/books_controller.rb

<<<<<<< HEAD 93.33% ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) 93.33% ======= 100.0% >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= 100.0% >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= 100.0% >>>>>>> 4e81ea2 (Featire specs) ======= 100.0% >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= 100.0% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 100.0% >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= 100.0% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= 93.75% >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> 5a2009f (Fix) ======= >>>>>>> ae884b4 (Fix) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= 100.0% >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= 100.0% >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= 100.0% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) 93.75% ======= 100.0% >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= ======= 100.0% >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs) lines covered

<<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) 15 relevant lines. 14 lines covered and 1 lines missed. ======= <<<<<<< HEAD ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab529 (Fix) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) 14 relevant lines. 14 lines covered and ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 14 relevant lines. 14 lines covered and ======= 12 relevant lines. 12 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 12 relevant lines. 12 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 12 relevant lines. 12 lines covered and >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) 0 lines missed. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= 15 relevant lines. 14 lines covered and 1 lines missed. >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) 15 relevant lines. 14 lines covered and 1 lines missed. ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f (Fix) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= ======= ======= >>>>>>> df37394 (Featire specs) 14 relevant lines. 14 lines covered and ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 14 relevant lines. 14 lines covered and ======= 12 relevant lines. 12 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 12 relevant lines. 12 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 12 relevant lines. 12 lines covered and >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) 0 lines missed. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= ======= 14 relevant lines. 14 lines covered and 0 lines missed. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= 16 relevant lines. 15 lines covered and 1 lines missed. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) 16 relevant lines. 15 lines covered and 1 lines missed. >>>>>>> 5507b42 (Featire specs) ======= 12 relevant lines. 12 lines covered and 0 lines missed. <<<<<<< HEAD >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs)
    
  1. 1 class BooksController < ApplicationController
  2. 1 <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 67ab529 (Fix) ======= >>>>>>> 8480924 (Featire specs) ======= >>>>>>> 5a2009f (Fix) ======= >>>>>>> 4f4ea3f (Featire specs) ======= >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= >>>>>>> ae884b4 (Fix) def index ======= <<<<<<< HEAD ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) PAGINATION_PER_PAGE = 12 >>>>>>> 9bfbd88 (Featire specs) ======= PAGINATION_PER_PAGE = 12 >>>>>>> 824bb2b (Featire specs)
  3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  4. =======
  5. ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) >>>>>>> 752f0c0 (Featire specs) =======
  6. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) >>>>>>> b28889f (Fix) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) def index
  7. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs)
  8. >>>>>>> 009401d (Featire specs) 24 =======
  9. 25 >>>>>>> 1214e1f (Add login registration pages) =======
  10. 24 >>>>>>> 08edf50 (Featire specs) =======
  11. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  12. 25 <<<<<<< HEAD >>>>>>> aca90e3 (Rebased) ======= >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs)
  13. 25 =======
  14. 24 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= =======
  15. 24 >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) @books_count = Book.count
  16. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  17. =======
  18. >>>>>>> 752f0c0 (Featire specs) =======
  19. >>>>>>> 4e81ea2 (Featire specs) 24 =======
  20. 25 >>>>>>> 1214e1f (Add login registration pages) =======
  21. 24 >>>>>>> 08edf50 (Featire specs) =======
  22. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  23. 25 <<<<<<< HEAD >>>>>>> aca90e3 (Rebased) ======= >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs)
  24. 25 =======
  25. 24 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= =======
  26. 24 >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) @categories = Category.all
  27. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  28. 24 =======
  29. 25 >>>>>>> 1214e1f (Add login registration pages) =======
  30. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  31. 25 <<<<<<< HEAD >>>>>>> aca90e3 (Rebased) ======= >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs)
  32. 25 =======
  33. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= =======
  34. >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD sorted_books = BookQuery.query(params).paginate(page: params[:page], ======= <<<<<<< HEAD <<<<<<< HEAD sorted_books = BookQuery.query(params).paginate(page: params[:page], ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs)
  35. <<<<<<< HEAD
  36. ======= <<<<<<< HEAD <<<<<<< HEAD
  37. =======
  38. 24 >>>>>>> d0dc1f1 (Featire specs) =======
  39. 24 >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD per_page: Constants::PAGINATION_PER_PAGE) ======= <<<<<<< HEAD <<<<<<< HEAD per_page: Constants::PAGINATION_PER_PAGE) ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> d0dc1f1 (Featire specs) ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs)
  40. =======
  41. >>>>>>> 824bb2b (Featire specs)
  42. <<<<<<< HEAD <<<<<<< HEAD
  43. 25 =======
  44. 1 >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD @books = BookDecorator.decorate_collection(sorted_books) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @books = BookDecorator.decorate_collection(sorted_books) ======= ======= >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) def index
  45. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
  46. 24 <<<<<<< HEAD ======= =======
  47. 25 >>>>>>> 1214e1f (Add login registration pages) =======
  48. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= =======
  49. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= =======
  50. 25 >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) ======= ======= >>>>>>> 59d75f9 (Featire specs)
  51. 25 >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3 (Add login registration pages) ======= ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024 (Add login registration pages) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages) >>>>>>> 29e1af9 (Add login registration pages)
  52. 25 =======
  53. 25 >>>>>>> 9620751 (Featire specs) =======
  54. 24 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> a636fda (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) =======
  55. 24 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= =======
  56. 24 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= =======
  57. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= =======
  58. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
  59. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3 (Add login registration pages) ======= ======= =======
  60. 24 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= =======
  61. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= =======
  62. 25 >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024 (Add login registration pages) ======= ======= >>>>>>> 29e1af9 (Add login registration pages) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> ae884b4 (Fix) =======
  63. 25 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> ae884b4 (Fix) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af9 (Add login registration pages) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs) @books_count = Book.count
  64. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> 4f4ea3f (Featire specs)
  65. 24 <<<<<<< HEAD ======= =======
  66. 25 >>>>>>> 1214e1f (Add login registration pages) =======
  67. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= =======
  68. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= =======
  69. 25 >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) ======= ======= >>>>>>> 59d75f9 (Featire specs)
  70. 25 >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3 (Add login registration pages) ======= ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024 (Add login registration pages) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages) >>>>>>> 29e1af9 (Add login registration pages)
  71. 25 =======
  72. 25 >>>>>>> 9620751 (Featire specs) =======
  73. 24 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> a636fda (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) =======
  74. 24 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= =======
  75. 24 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= =======
  76. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= =======
  77. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
  78. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3 (Add login registration pages) ======= ======= =======
  79. 24 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= =======
  80. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= =======
  81. 25 >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024 (Add login registration pages) ======= ======= >>>>>>> 29e1af9 (Add login registration pages) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> ae884b4 (Fix) =======
  82. 25 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> ae884b4 (Fix) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af9 (Add login registration pages) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs) @categories = Category.all
  83. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> 4f4ea3f (Featire specs) >>>>>>> 5c33a07 (Featire specs)
  84. 24 <<<<<<< HEAD ======= ======= ======= >>>>>>> 22ee41c (Add login registration pages)
  85. 24 =======
  86. 25 >>>>>>> 1214e1f (Add login registration pages) =======
  87. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= =======
  88. 25 >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) ======= ======= >>>>>>> 59d75f9 (Featire specs)
  89. 25 >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3 (Add login registration pages) ======= ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024 (Add login registration pages) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages) >>>>>>> 29e1af9 (Add login registration pages)
  90. 25 =======
  91. 25 >>>>>>> 9620751 (Featire specs) =======
  92. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> a636fda (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) =======
  93. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= =======
  94. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= =======
  95. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= =======
  96. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> d8abfed (Featire specs) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> ae884b4 (Fix) =======
  97. 25 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> ae884b4 (Fix) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs) <<<<<<< HEAD sorted_books = BookQuery.query(params).paginate(page: params[:page], ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) sorted_books = BookQuery.query(params).paginate(page: params[:page], ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= sorted_books = BookQuery.query(params).paginate(page: params[:page], >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> ae884b4 (Fix) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs)
  98. <<<<<<< HEAD
  99. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs)
  100. =======
  101. 24 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
  102. 24 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> af057e3 (Featire specs) =======
  103. 24 >>>>>>> 4e81ea2 (Featire specs) =======
  104. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> d8abfed (Featire specs) =======
  105. 24 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> d8abfed (Featire specs) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> ae884b4 (Fix) =======
  106. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> ae884b4 (Fix) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= >>>>>>> 34509ee (Featire specs) ======= >>>>>>> 67ab529 (Fix) ======= >>>>>>> 8480924 (Featire specs) ======= >>>>>>> 5a2009f (Fix) ======= >>>>>>> 365d41e (Featire specs) ======= >>>>>>> c05ee51 (Featire specs) ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> ae884b4 (Fix) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 1ca9c0e (Featire specs) per_page: PAGINATION_PER_PAGE) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 160fb15 (Fix) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) per_page: Constants::PAGINATION_PER_PAGE) ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 4e81ea2 (Featire specs) ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 7a02bbe (Featire specs) ======= per_page: Constants::PAGINATION_PER_PAGE) >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs)
  107. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs)
  108. 25 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @books = BookDecorator.decorate_collection(sorted_books) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> 557c1b8 (Fix) @books = BookDecorator.decorate_collection(sorted_books) ======= <<<<<<< HEAD <<<<<<< HEAD @books = BookDecorator.decorate_collection(sorted_books) >>>>>>> c8da2e3 (Fix) ======= def index
  109. 25 @books_count = Book.count
  110. 25 @categories = Category.all
  111. 25 <<<<<<< HEAD ======= =======
  112. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  113. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3 (Add login registration pages) ======= =======
  114. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 29e1af9 (Add login registration pages) =======
  115. 25 >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024 (Add login registration pages) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 29e1af9 (Add login registration pages) sorted_books = BookQuery.query(params).paginate(page: params[:page],
  116. per_page: PAGINATION_PER_PAGE) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f (Fix) >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f92 (Add login registration pages) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= ======= @books = BookDecorator.decorate_collection(sorted_books) >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= @books = BookDecorator.decorate_collection(sorted_books) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= @books = BookDecorator.decorate_collection(sorted_books) >>>>>>> a5d032d (Fix) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= @books = BookDecorator.decorate_collection(sorted_books) >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) >>>>>>> ae884b4 (Fix)
  117. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> 5a2009f (Fix) ======= >>>>>>> 4f4ea3f (Featire specs) ======= >>>>>>> ae884b4 (Fix) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> c51bf93 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> ae884b4 (Fix) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> 4f4ea3f (Featire specs)
  118. >>>>>>> 752f0c0 (Featire specs) =======
  119. >>>>>>> 4e81ea2 (Featire specs) =======
  120. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> ae884b4 (Fix) ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) >>>>>>> ae884b4 (Fix)
  121. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3 (Add login registration pages) ======= >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= >>>>>>> e989024 (Add login registration pages) ======= >>>>>>> 67ab529 (Fix) ======= >>>>>>> 8480924 (Featire specs)
  122. =======
  123. >>>>>>> 752f0c0 (Featire specs) =======
  124. >>>>>>> 4e81ea2 (Featire specs) 24 =======
  125. 25 >>>>>>> 1214e1f (Add login registration pages) =======
  126. 24 >>>>>>> 08edf50 (Featire specs) =======
  127. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 793a6ed (Add login registration pages) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> c5efe8e (Add login registration pages) ======= >>>>>>> 160fb15 (Fix) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> 4f4ea3f (Featire specs)
  128. 24 <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 8480924 (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3 (Add login registration pages) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> e989024 (Add login registration pages) ======= ======= >>>>>>> 29e1af9 (Add login registration pages) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages) >>>>>>> 29e1af9 (Add login registration pages)
  129. 25 <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f92 (Add login registration pages) ======= ======= >>>>>>> 365d41e (Featire specs) ======= >>>>>>> f136376 (Featire specs) ======= <<<<<<< HEAD
  130. 25 <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 932dbec (Featire specs) >>>>>>> f136376 (Featire specs) >>>>>>> 1214e1f (Add login registration pages) =======
  131. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= =======
  132. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= =======
  133. 25 >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @books = BookDecorator.decorate_collection(sorted_books) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) @books = BookDecorator.decorate_collection(sorted_books) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @books = BookDecorator.decorate_collection(sorted_books) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 752f0c0 (Featire specs) ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 4e81ea2 (Featire specs) ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= @books = BookDecorator.decorate_collection(sorted_books) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= @books = BookDecorator.decorate_collection(sorted_books) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs)
  134. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  135. ======= ======= ======= >>>>>>> 824bb2b (Featire specs)
  136. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  137. ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs)
  138. >>>>>>> 752f0c0 (Featire specs) =======
  139. >>>>>>> 4e81ea2 (Featire specs) =======
  140. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) =======
  141. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= =======
  142. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs)
  143. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  144. =======
  145. >>>>>>> 752f0c0 (Featire specs) =======
  146. >>>>>>> 4e81ea2 (Featire specs) 24 =======
  147. 25 >>>>>>> 1214e1f (Add login registration pages) =======
  148. 24 >>>>>>> 08edf50 (Featire specs) =======
  149. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  150. 25 >>>>>>> aca90e3 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
  151. 24 <<<<<<< HEAD ======= =======
  152. 25 >>>>>>> 1214e1f (Add login registration pages) =======
  153. 24 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= =======
  154. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= =======
  155. 25 >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= ======= >>>>>>> 824bb2b (Featire specs) =======
  156. 25 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> 9ec6862 (Add login registration pages) =======
  157. 24 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= =======
  158. 24 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= =======
  159. 24 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= ======= <<<<<<< HEAD ======= =======
  160. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  161. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3 (Add login registration pages) ======= =======
  162. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= =======
  163. 25 >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> e989024 (Add login registration pages) @books = BookDecorator.decorate_collection(sorted_books)
  164. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3 (Add login registration pages) ======= >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= >>>>>>> e989024 (Add login registration pages)
  165. 25 >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f92 (Add login registration pages) ======= ======= ======= =======
  166. 24 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= ======= =======
  167. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= =======
  168. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3 (Add login registration pages) ======= ======= ======= =======
  169. 24 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= ======= =======
  170. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  171. 25 >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024 (Add login registration pages) ======= ======= =======
  172. 25 >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 5507b42 (Featire specs)
  173. 24 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) =======
  174. 24 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD ======= ======= =======
  175. 24 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= =======
  176. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  177. 25 >>>>>>> 730a8ca (Add login registration pages) =======
  178. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) =======
  179. 25 >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD @books = BookDecorator.decorate_collection(sorted_books) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @books = BookDecorator.decorate_collection(sorted_books) ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 752f0c0 (Featire specs) ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 4e81ea2 (Featire specs) ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs)
  180. <<<<<<< HEAD
  181. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  182. =======
  183. >>>>>>> 752f0c0 (Featire specs) =======
  184. >>>>>>> 4e81ea2 (Featire specs) =======
  185. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs)
  186. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages)
  187. 25 >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= =======
  188. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= =======
  189. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
  190. 24 <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= =======
  191. 25 <<<<<<< HEAD >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) ======= =======
  192. 24 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) ======= =======
  193. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= =======
  194. 25 >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) =======
  195. 25 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) =======
  196. 24 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af9 (Add login registration pages) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs) respond_to do |format|
  197. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f92 (Add login registration pages) ======= >>>>>>> 6e923b9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8249ff3 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e989024 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs)
  198. =======
  199. >>>>>>> 752f0c0 (Featire specs) =======
  200. >>>>>>> 4e81ea2 (Featire specs) 24 =======
  201. 25 >>>>>>> 1214e1f (Add login registration pages) =======
  202. 24 >>>>>>> 08edf50 (Featire specs) =======
  203. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  204. 25 >>>>>>> aca90e3 (Rebased) ======= ======= <<<<<<< HEAD ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) ======= >>>>>>> adc21e0 (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> 793a6ed (Add login registration pages) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> c5efe8e (Add login registration pages) ======= >>>>>>> 160fb15 (Fix) ======= >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs)
  205. 25 >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 8249ff3 (Add login registration pages) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> fc3774f (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f92 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> 4f4ea3f (Featire specs)
  206. 24 <<<<<<< HEAD ======= =======
  207. 25 >>>>>>> 1214e1f (Add login registration pages) =======
  208. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= >>>>>>> 4f4ea3f (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= ======= ======= ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs)
  209. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3 (Add login registration pages) ======= >>>>>>> 8480924 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 57a2e05 (Add login registration pages) =======
  210. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= =======
  211. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 824bb2b (Featire specs) =======
  212. 25 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs)
  213. 25 =======
  214. 25 >>>>>>> 9620751 (Featire specs) =======
  215. 24 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) =======
  216. 24 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= =======
  217. 24 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= =======
  218. 25 >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f92 (Add login registration pages) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= =======
  219. 24 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= >>>>>>> fc3774f (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) >>>>>>> c8da2e3 (Fix) ======= =======
  220. 24 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= =======
  221. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= =======
  222. 25 >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024 (Add login registration pages) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 31507b8 (Add login registration pages) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) =======
  223. 25 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af9 (Add login registration pages) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs) format.html
  224. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f92 (Add login registration pages) ======= >>>>>>> 6e923b9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8249ff3 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e989024 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs)
  225. =======
  226. >>>>>>> 752f0c0 (Featire specs) =======
  227. >>>>>>> 4e81ea2 (Featire specs) 24 =======
  228. 25 >>>>>>> 1214e1f (Add login registration pages) =======
  229. 24 >>>>>>> 08edf50 (Featire specs) =======
  230. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  231. 25 >>>>>>> aca90e3 (Rebased) ======= ======= <<<<<<< HEAD ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) ======= >>>>>>> adc21e0 (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> 793a6ed (Add login registration pages) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> c5efe8e (Add login registration pages) ======= >>>>>>> 160fb15 (Fix) ======= >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs)
  232. 25 >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 8249ff3 (Add login registration pages) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> fc3774f (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f92 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> 4f4ea3f (Featire specs)
  233. 24 <<<<<<< HEAD ======= =======
  234. 25 >>>>>>> 1214e1f (Add login registration pages) =======
  235. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= >>>>>>> 4f4ea3f (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= ======= ======= ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs)
  236. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3 (Add login registration pages) ======= >>>>>>> 8480924 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 57a2e05 (Add login registration pages) =======
  237. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= =======
  238. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 824bb2b (Featire specs) =======
  239. 25 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs)
  240. 25 =======
  241. 25 >>>>>>> 9620751 (Featire specs) =======
  242. 24 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) =======
  243. 24 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= =======
  244. 24 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= =======
  245. 25 >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f92 (Add login registration pages) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= =======
  246. 24 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= >>>>>>> fc3774f (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) >>>>>>> c8da2e3 (Fix) ======= =======
  247. 24 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= =======
  248. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= =======
  249. 25 >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024 (Add login registration pages) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 31507b8 (Add login registration pages) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) =======
  250. 25 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af9 (Add login registration pages) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs) format.json do
  251. <<<<<<< HEAD <<<<<<< HEAD
  252. ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  253. ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab529 (Fix) <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs)
  254. =======
  255. <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  256. >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) =======
  257. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  258. >>>>>>> 34509ee (Featire specs) >>>>>>> 3723aad (Featire specs) ======= =======
  259. ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs)
  260. ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  261. =======
  262. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  263. >>>>>>> 9c0d812 (Featire specs) =======
  264. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) =======
  265. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) >>>>>>> 4f4ea3f (Featire specs)
  266. =======
  267. >>>>>>> 752f0c0 (Featire specs) =======
  268. >>>>>>> 4e81ea2 (Featire specs) =======
  269. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 4f4ea3f (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= =======
  270. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= =======
  271. >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
  272. >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs)
  273. =======
  274. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= =======
  275. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= =======
  276. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= =======
  277. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= =======
  278. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= =======
  279. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= =======
  280. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) =======
  281. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  282. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= =======
  283. =======
  284. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= =======
  285. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs) 1 render json: {
  286. <<<<<<< HEAD <<<<<<< HEAD
  287. ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  288. ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab529 (Fix) <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs)
  289. =======
  290. <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  291. >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) =======
  292. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  293. >>>>>>> 34509ee (Featire specs) >>>>>>> 3723aad (Featire specs) ======= =======
  294. ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs)
  295. ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  296. =======
  297. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  298. >>>>>>> 9c0d812 (Featire specs) =======
  299. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) =======
  300. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) >>>>>>> 4f4ea3f (Featire specs)
  301. =======
  302. >>>>>>> 752f0c0 (Featire specs) =======
  303. >>>>>>> 4e81ea2 (Featire specs) =======
  304. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 4f4ea3f (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= =======
  305. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= =======
  306. >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
  307. >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs)
  308. =======
  309. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= =======
  310. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= =======
  311. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= =======
  312. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= =======
  313. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= =======
  314. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= =======
  315. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) =======
  316. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  317. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= =======
  318. =======
  319. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= =======
  320. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs) entries: render_to_string(partial: 'books', formats: [:html]),
  321. <<<<<<< HEAD <<<<<<< HEAD
  322. ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  323. ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab529 (Fix) <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs)
  324. =======
  325. <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  326. >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) =======
  327. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  328. >>>>>>> 34509ee (Featire specs) >>>>>>> 3723aad (Featire specs) ======= =======
  329. ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs)
  330. ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  331. =======
  332. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  333. >>>>>>> 9c0d812 (Featire specs) =======
  334. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) =======
  335. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) >>>>>>> 4f4ea3f (Featire specs)
  336. =======
  337. >>>>>>> 752f0c0 (Featire specs) =======
  338. >>>>>>> 4e81ea2 (Featire specs) =======
  339. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 4f4ea3f (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= =======
  340. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= =======
  341. >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
  342. >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs)
  343. =======
  344. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= =======
  345. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= =======
  346. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= =======
  347. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= =======
  348. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= =======
  349. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= =======
  350. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) =======
  351. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  352. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= =======
  353. =======
  354. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= =======
  355. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs) pagination: view_context.will_paginate(@books)
  356. <<<<<<< HEAD <<<<<<< HEAD
  357. ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  358. ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab529 (Fix) <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs)
  359. =======
  360. <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  361. >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) =======
  362. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  363. >>>>>>> 34509ee (Featire specs) >>>>>>> 3723aad (Featire specs) ======= =======
  364. ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs)
  365. ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  366. =======
  367. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  368. >>>>>>> 9c0d812 (Featire specs) =======
  369. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) =======
  370. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) >>>>>>> 4f4ea3f (Featire specs)
  371. =======
  372. >>>>>>> 752f0c0 (Featire specs) =======
  373. >>>>>>> 4e81ea2 (Featire specs) =======
  374. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 4f4ea3f (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= =======
  375. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= =======
  376. >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
  377. >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs)
  378. =======
  379. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= =======
  380. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= =======
  381. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= =======
  382. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= =======
  383. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= =======
  384. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= =======
  385. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) =======
  386. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  387. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= =======
  388. =======
  389. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= =======
  390. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs) }
  391. <<<<<<< HEAD <<<<<<< HEAD
  392. ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  393. ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab529 (Fix) <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs)
  394. =======
  395. <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  396. >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) =======
  397. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  398. >>>>>>> 34509ee (Featire specs) >>>>>>> 3723aad (Featire specs) ======= =======
  399. ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs)
  400. ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  401. =======
  402. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  403. >>>>>>> 9c0d812 (Featire specs) =======
  404. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) =======
  405. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) >>>>>>> 4f4ea3f (Featire specs)
  406. =======
  407. >>>>>>> 752f0c0 (Featire specs) =======
  408. >>>>>>> 4e81ea2 (Featire specs) =======
  409. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 4f4ea3f (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= =======
  410. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= =======
  411. >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
  412. >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs)
  413. =======
  414. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= =======
  415. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= =======
  416. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= =======
  417. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= =======
  418. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= =======
  419. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= =======
  420. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) =======
  421. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  422. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= =======
  423. =======
  424. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= =======
  425. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs) end
  426. <<<<<<< HEAD <<<<<<< HEAD
  427. ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  428. ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab529 (Fix) <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs)
  429. =======
  430. <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  431. >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) =======
  432. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  433. >>>>>>> 34509ee (Featire specs) >>>>>>> 3723aad (Featire specs) ======= =======
  434. ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs)
  435. ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  436. =======
  437. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  438. >>>>>>> 9c0d812 (Featire specs) =======
  439. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) =======
  440. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) >>>>>>> 4f4ea3f (Featire specs)
  441. =======
  442. >>>>>>> 752f0c0 (Featire specs) =======
  443. >>>>>>> 4e81ea2 (Featire specs) =======
  444. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 4f4ea3f (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= =======
  445. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= =======
  446. >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
  447. >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs)
  448. =======
  449. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= =======
  450. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= =======
  451. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= =======
  452. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= =======
  453. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= =======
  454. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= =======
  455. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) =======
  456. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  457. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= =======
  458. =======
  459. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= =======
  460. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs) end
  461. <<<<<<< HEAD <<<<<<< HEAD
  462. ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  463. ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab529 (Fix) <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs)
  464. =======
  465. <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  466. >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) =======
  467. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  468. >>>>>>> 34509ee (Featire specs) >>>>>>> 3723aad (Featire specs) ======= =======
  469. ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs)
  470. ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  471. =======
  472. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  473. >>>>>>> 9c0d812 (Featire specs) =======
  474. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) =======
  475. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) >>>>>>> 4f4ea3f (Featire specs)
  476. =======
  477. >>>>>>> 752f0c0 (Featire specs) =======
  478. >>>>>>> 4e81ea2 (Featire specs) =======
  479. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 4f4ea3f (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= =======
  480. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= =======
  481. >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
  482. >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs)
  483. =======
  484. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= =======
  485. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= =======
  486. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= =======
  487. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= =======
  488. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= =======
  489. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= =======
  490. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) =======
  491. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  492. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= =======
  493. =======
  494. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= =======
  495. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs) end
  496. <<<<<<< HEAD <<<<<<< HEAD
  497. ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  498. ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab529 (Fix) <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs)
  499. =======
  500. <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  501. >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) =======
  502. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  503. >>>>>>> 34509ee (Featire specs) >>>>>>> 3723aad (Featire specs) ======= =======
  504. ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs)
  505. ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  506. =======
  507. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  508. >>>>>>> 9c0d812 (Featire specs) =======
  509. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) =======
  510. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) >>>>>>> 4f4ea3f (Featire specs)
  511. =======
  512. >>>>>>> 752f0c0 (Featire specs) =======
  513. >>>>>>> 4e81ea2 (Featire specs) =======
  514. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 4f4ea3f (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= =======
  515. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= =======
  516. >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
  517. >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs)
  518. =======
  519. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= =======
  520. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= =======
  521. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= =======
  522. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= =======
  523. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= =======
  524. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= =======
  525. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) =======
  526. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  527. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= =======
  528. =======
  529. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= =======
  530. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs)
  531. <<<<<<< HEAD <<<<<<< HEAD
  532. ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  533. ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab529 (Fix) <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs)
  534. =======
  535. <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  536. >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) =======
  537. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  538. >>>>>>> 34509ee (Featire specs) >>>>>>> 3723aad (Featire specs) ======= =======
  539. ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs)
  540. ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  541. =======
  542. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  543. >>>>>>> 9c0d812 (Featire specs) =======
  544. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) =======
  545. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) >>>>>>> 4f4ea3f (Featire specs)
  546. =======
  547. >>>>>>> 752f0c0 (Featire specs) =======
  548. >>>>>>> 4e81ea2 (Featire specs) =======
  549. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 4f4ea3f (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= =======
  550. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= =======
  551. >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
  552. >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs)
  553. =======
  554. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= =======
  555. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= =======
  556. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= =======
  557. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= =======
  558. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= =======
  559. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= =======
  560. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) =======
  561. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  562. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= =======
  563. =======
  564. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= =======
  565. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs) 1 def show
  566. <<<<<<< HEAD <<<<<<< HEAD
  567. 11 ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  568. 11 ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab529 (Fix) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs)
  569. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  570. =======
  571. >>>>>>> 752f0c0 (Featire specs) =======
  572. >>>>>>> 4e81ea2 (Featire specs) =======
  573. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) 7 <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs)
  574. 11 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  575. 11 =======
  576. 11 >>>>>>> 9620751 (Featire specs) =======
  577. 7 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) =======
  578. 7 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= =======
  579. 7 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= =======
  580. 7 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f (Fix) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= ======= ======= >>>>>>> df37394 (Featire specs)
  581. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  582. =======
  583. >>>>>>> 752f0c0 (Featire specs) =======
  584. >>>>>>> 4e81ea2 (Featire specs) =======
  585. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) 7 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= =======
  586. 7 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= =======
  587. 7 <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) =======
  588. 11 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
  589. 7 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD book = Book.find_by(id: params[:id]) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD book = Book.find_by(id: params[:id]) ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab529 (Fix) <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) @book = Book.find(params[:id]).decorate ======= book = Book.find_by(id: params[:id]) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= book = Book.find_by(id: params[:id]) >>>>>>> 9c0d812 (Featire specs) ======= ======= @book = Book.find(params[:id]).decorate ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) @book = Book.find(params[:id]).decorate ======= book = Book.find_by(id: params[:id]) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= book = Book.find_by(id: params[:id]) >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) >>>>>>> 4f4ea3f (Featire specs) @book = Book.find(params[:id]).decorate ======= @book = Book.find_by(id: params[:id]) >>>>>>> 752f0c0 (Featire specs) ======= @book = Book.find_by(id: params[:id]) >>>>>>> 4e81ea2 (Featire specs) ======= @book = Book.find_by(id: params[:id]) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= ======= @book = Book.find(params[:id]).decorate >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= book = Book.find_by(id: params[:id]) >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= book = Book.find_by(id: params[:id]) >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774f (Featire specs) book = Book.find_by(id: params[:id]) ======= @book = Book.find_by(id: params[:id]) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= @book = Book.find_by(id: params[:id]) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= ======= @book = Book.find_by(id: params[:id]) >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= ======= @book = Book.find_by(id: params[:id]) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f (Fix) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= ======= @book = Book.find(params[:id]).decorate >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= ======= @book = Book.find_by(id: params[:id]) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= ======= @book = Book.find(params[:id]).decorate >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= ======= book = Book.find(params[:id]) >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= book = Book.find(params[:id]) >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= book = Book.find(params[:id]) >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) book = Book.find(params[:id]) ======= @book = Book.find_by(id: params[:id]) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= ======= @book = Book.find_by(id: params[:id]) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs)
  590. <<<<<<< HEAD <<<<<<< HEAD
  591. ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  592. ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab529 (Fix) <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs)
  593. =======
  594. <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  595. >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) =======
  596. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  597. >>>>>>> 34509ee (Featire specs) >>>>>>> 3723aad (Featire specs) ======= =======
  598. ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs)
  599. ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  600. =======
  601. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  602. >>>>>>> 9c0d812 (Featire specs) =======
  603. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) =======
  604. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) >>>>>>> 4f4ea3f (Featire specs)
  605. =======
  606. >>>>>>> 752f0c0 (Featire specs) =======
  607. >>>>>>> 4e81ea2 (Featire specs) =======
  608. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 4f4ea3f (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= =======
  609. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= =======
  610. >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
  611. >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs)
  612. =======
  613. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= =======
  614. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= =======
  615. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= =======
  616. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= =======
  617. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= =======
  618. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= =======
  619. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) =======
  620. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  621. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= =======
  622. =======
  623. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= =======
  624. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs)
  625. <<<<<<< HEAD <<<<<<< HEAD
  626. 11 ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  627. 11 ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab529 (Fix) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs)
  628. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  629. =======
  630. >>>>>>> 752f0c0 (Featire specs) =======
  631. >>>>>>> 4e81ea2 (Featire specs) =======
  632. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) 7 <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs)
  633. 11 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  634. 11 =======
  635. 11 >>>>>>> 9620751 (Featire specs) =======
  636. 7 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) =======
  637. 7 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= =======
  638. 7 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= =======
  639. 7 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f (Fix) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= ======= ======= >>>>>>> df37394 (Featire specs)
  640. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  641. =======
  642. >>>>>>> 752f0c0 (Featire specs) =======
  643. >>>>>>> 4e81ea2 (Featire specs) =======
  644. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) 7 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= =======
  645. 7 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= =======
  646. 7 <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) =======
  647. 11 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
  648. 7 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs) <<<<<<< HEAD if book.nil? ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 77d62af (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) if book.nil? ======= redirect_to books_path if @book.nil? >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 932dbec (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= redirect_to books_path if @book.nil? >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= redirect_to books_path if @book.nil? >>>>>>> 4e81ea2 (Featire specs) ======= redirect_to books_path if @book.nil? >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= redirect_to books_path if @book.nil? >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= redirect_to books_path if @book.nil? >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= redirect_to books_path if @book.nil? >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= if book.nil? >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> 5a2009f (Fix) ======= >>>>>>> ae884b4 (Fix) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= redirect_to books_path if @book.nil? >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= redirect_to books_path if @book.nil? >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= redirect_to books_path if @book.nil? >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= ======= redirect_to books_path if @book.nil? >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs)
  649. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs)
  650. ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs)
  651. =======
  652. >>>>>>> 752f0c0 (Featire specs) =======
  653. >>>>>>> 4e81ea2 (Featire specs) =======
  654. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= =======
  655. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) >>>>>>> 5a2009f (Fix)
  656. redirect_to books_path
  657. else
  658. 11 <<<<<<< HEAD ======= @reviews = ReviewDecorator.decorate_collection(Review.where(book_id: book.id).order(created_at: :desc))
  659. 11 >>>>>>> a5d032d (Fix) @book = book.decorate
  660. <<<<<<< HEAD
  661. =======
  662. >>>>>>> a5d032d (Fix) end
  663. <<<<<<< HEAD
  664. <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab529 (Fix) <<<<<<< HEAD
  665. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  666. =======
  667. >>>>>>> 752f0c0 (Featire specs) =======
  668. >>>>>>> 4e81ea2 (Featire specs) =======
  669. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= =======
  670. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs)
  671. redirect_to books_path
  672. else
  673. 11 <<<<<<< HEAD ======= @reviews = ReviewDecorator.decorate_collection(Review.where(book_id: book.id).order(created_at: :desc))
  674. 11 >>>>>>> a5d032d (Fix) @book = book.decorate
  675. <<<<<<< HEAD
  676. =======
  677. >>>>>>> a5d032d (Fix) end
  678. <<<<<<< HEAD
  679. <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) ======= =======
  680. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= =======
  681. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= =======
  682. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= =======
  683. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f (Fix) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= =======
  684. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= =======
  685. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= =======
  686. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= =======
  687. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) =======
  688. <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  689. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= ======= =======
  690. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= =======
  691. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs) end
  692. <<<<<<< HEAD <<<<<<< HEAD
  693. ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  694. ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab529 (Fix) <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs)
  695. =======
  696. <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  697. >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) =======
  698. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  699. >>>>>>> 34509ee (Featire specs) >>>>>>> 3723aad (Featire specs) ======= =======
  700. ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs)
  701. ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  702. =======
  703. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  704. >>>>>>> 9c0d812 (Featire specs) =======
  705. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) =======
  706. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) >>>>>>> 4f4ea3f (Featire specs)
  707. =======
  708. >>>>>>> 752f0c0 (Featire specs) =======
  709. >>>>>>> 4e81ea2 (Featire specs) =======
  710. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 4f4ea3f (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= =======
  711. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= =======
  712. >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
  713. >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs)
  714. =======
  715. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= =======
  716. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= =======
  717. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= =======
  718. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= =======
  719. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= =======
  720. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= =======
  721. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) =======
  722. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  723. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs)
  724. =======
  725. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= =======
  726. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs) end

app/controllers/home_controller.rb

100.0% lines covered

7 relevant lines. 7 lines covered and 0 lines missed.
    
  1. 1 class HomeController < ApplicationController
  2. 1 def index
  3. <<<<<<< HEAD
  4. 13 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 77d62af (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs)
  5. 13 =======
  6. 3 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
  7. 3 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 77d62af (Featire specs)
  8. 3 >>>>>>> 4e81ea2 (Featire specs) =======
  9. 3 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) ======= ======= ======= >>>>>>> fc3774f (Featire specs) <<<<<<< HEAD =======
  10. 3 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD =======
  11. 3 >>>>>>> 7a02bbe (Featire specs) =======
  12. 3 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) =======
  13. 13 >>>>>>> a5d032d (Fix) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab529 (Fix) <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> 34509ee (Featire specs) >>>>>>> 3723aad (Featire specs) ======= ======= @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) ======= =======
  14. 3 >>>>>>> 7a02bbe (Featire specs) =======
  15. 3 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) =======
  16. 13 >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> 9c0d812 (Featire specs) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) >>>>>>> 4f4ea3f (Featire specs) @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> 752f0c0 (Featire specs) ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> 4e81ea2 (Featire specs) ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 4f4ea3f (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= ======= @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= ======= @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs)
  17. <<<<<<< HEAD
  18. 13 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 77d62af (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs)
  19. 13 =======
  20. 3 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
  21. 3 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 77d62af (Featire specs)
  22. 3 >>>>>>> 4e81ea2 (Featire specs) =======
  23. 3 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) =======
  24. 3 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  25. 3 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> d8abfed (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) =======
  26. 3 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> ae884b4 (Fix) =======
  27. 13 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> 5a2009f (Fix) ======= >>>>>>> ae884b4 (Fix) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs) @best_sellers = best_sellers
  28. end
  29. 1 private
  30. 1 def best_sellers
  31. <<<<<<< HEAD
  32. 13 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 77d62af (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs)
  33. 13 =======
  34. 3 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) =======
  35. 3 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix)
  36. 3 >>>>>>> 4e81ea2 (Featire specs) =======
  37. 3 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) ======= ======= ======= >>>>>>> fc3774f (Featire specs) <<<<<<< HEAD =======
  38. 3 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD =======
  39. 3 >>>>>>> 7a02bbe (Featire specs) =======
  40. 3 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) =======
  41. 13 >>>>>>> a5d032d (Fix) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab529 (Fix) <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) BookDecorator.decorate_collection(Book.first(4)) ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> 34509ee (Featire specs) >>>>>>> 3723aad (Featire specs) ======= ======= BookDecorator.decorate_collection(Book.first(4)) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) BookDecorator.decorate_collection(Book.first(4)) ======= =======
  42. 3 >>>>>>> 7a02bbe (Featire specs) =======
  43. 3 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) =======
  44. 13 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD BookDecorator.decorate_collection(Book.first(4)) ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> 9c0d812 (Featire specs) ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) >>>>>>> 4f4ea3f (Featire specs) BookDecorator.decorate_collection(Book.first(4)) ======= Book.first(4) >>>>>>> 752f0c0 (Featire specs) ======= Book.first(4) >>>>>>> 4e81ea2 (Featire specs) ======= Book.first(4) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 4f4ea3f (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= BookDecorator.decorate_collection(Book.first(4)) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) ======= Book.first(4) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= Book.first(4) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= ======= Book.first(4) >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= ======= BookDecorator.decorate_collection(Book.first(4)) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= ======= Book.first(4) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= ======= BookDecorator.decorate_collection(Book.first(4)) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> a5d032d (Fix) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) >>>>>>> ae884b4 (Fix)
  45. end
  46. end
<<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true)

app/controllers/reviews_controller.rb

100.0% lines covered

10 relevant lines. 10 lines covered and 0 lines missed.
    
  1. 1 class ReviewsController < ApplicationController
  2. 1 before_action :authenticate_user!
  3. 1 def create
  4. 2 @review = Review.new(review_params)
  5. 2 if @review.save
  6. 1 redirect_to book_path(@review.book), notice: I18n.t('review.success')
  7. else
  8. 1 redirect_to book_path(@review.book), alert: @review.errors.full_messages.join(', ')
  9. end
  10. end
  11. 1 private
  12. 1 def review_params
  13. 2 params.permit(:title, :body, :book_id, :user_id, :rating, :verified)
  14. end
  15. end

app/controllers/users_controller.rb

86.67% lines covered

15 relevant lines. 13 lines covered and 2 lines missed.
    
  1. 1 class UsersController < ApplicationController
  2. 1 before_action :authenticate_user!
  3. 1 def edit
  4. 9 @user_billing = Billing.find_or_create_by(user_id: current_user.id)
  5. 9 @user_shipping = Shipping.find_or_create_by(user_id: current_user.id)
  6. end
  7. 1 def update
  8. 5 update_user = UserUpdate.call(permitted_params: permitted_params, current_user: current_user)
  9. 5 if update_user.success?
  10. 4 redirect_to edit_user_path, notice: I18n.t('settings.message.update')
  11. else
  12. 1 redirect_to edit_user_path, alert: I18n.t('settings.error.error')
  13. end
  14. end
  15. 1 def destroy
  16. current_user.destroy
  17. redirect_to root_path, notice: I18n.t('devise.registrations.destroyed')
  18. end
  19. 1 def permitted_params
  20. 5 params.permit(
  21. user: %i[password current_password password_confirmation email],
  22. billing: %i[first_name last_name address city zip country phone],
  23. shipping: %i[first_name last_name address city zip country phone]
  24. )
  25. end
  26. end
<<<<<<< HEAD >>>>>>> a5d032d (Fix) ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true)
=======
>>>>>>> bd8bda4 (Manifest_cache true)

app/decorators/author_decorator.rb

<<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= =======

app/helpers/application_helper.rb

>>>>>>> 752f0c0 (Featire specs) =======

app/decorators/author_decorator.rb

>>>>>>> bd8bda4 (Manifest_cache true) =======

app/helpers/application_helper.rb

>>>>>>> 4e81ea2 (Featire specs) =======

app/decorators/author_decorator.rb

>>>>>>> aa7b40c (Manifest_cache true) =======

app/helpers/application_helper.rb

>>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)

app/controllers/reviews_controller.rb

100.0% lines covered

9 relevant lines. 9 lines covered and 0 lines missed.
    
  1. 1 class ReviewsController < ApplicationController
  2. 1 before_action :authenticate_user!
  3. 1 def create
  4. 2 @review = Review.new(review_params)
  5. 2 return redirect_to book_path(@review.book), notice: I18n.t('review.success') if @review.save
  6. 1 redirect_to book_path(@review.book), alert: @review.errors.full_messages.join(', ')
  7. end
  8. 1 private
  9. 1 def review_params
  10. 2 params.permit(:title, :body, :book_id, :user_id, :rating, :verified)
  11. end
  12. end

app/controllers/users_controller.rb

86.67% lines covered

15 relevant lines. 13 lines covered and 2 lines missed.
    
  1. 1 class UsersController < ApplicationController
  2. 1 before_action :authenticate_user!
  3. 1 def edit
  4. 9 @user_billing = Billing.find_or_create_by(user_id: current_user.id)
  5. 9 @user_shipping = Shipping.find_or_create_by(user_id: current_user.id)
  6. end
  7. 1 def update
  8. 5 update_user = UserUpdate.call(permitted_params: permitted_params, current_user: current_user)
  9. 5 if update_user.success?
  10. 4 redirect_to edit_user_path, notice: I18n.t('settings.message.update')
  11. else
  12. 1 redirect_to edit_user_path, alert: I18n.t('settings.error.error')
  13. end
  14. end
  15. 1 def destroy
  16. current_user.destroy
  17. redirect_to root_path, notice: I18n.t('devise.registrations.destroyed')
  18. end
  19. 1 def permitted_params
  20. 5 params.permit(
  21. user: %i[password current_password password_confirmation email],
  22. billing: %i[first_name last_name address city zip country phone],
  23. shipping: %i[first_name last_name address city zip country phone]
  24. )
  25. end
  26. end
<<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> 98beee2 (Manifest_cache true) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab529 (Fix) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= =======

app/controllers/reviews_controller.rb

100.0% lines covered

10 relevant lines. 10 lines covered and 0 lines missed.
    
  1. 1 class ReviewsController < ApplicationController
  2. 1 before_action :authenticate_user!
  3. 1 def create
  4. 2 @review = Review.new(review_params)
  5. 2 if @review.save
  6. 1 redirect_to book_path(@review.book), notice: I18n.t('review.success')
  7. else
  8. 1 redirect_to book_path(@review.book), alert: @review.errors.full_messages.join(', ')
  9. end
  10. end
  11. 1 private
  12. 1 def review_params
  13. 2 params.permit(:title, :body, :book_id, :user_id, :rating, :verified)
  14. end
  15. end

app/controllers/users_controller.rb

86.67% lines covered

15 relevant lines. 13 lines covered and 2 lines missed.
    
  1. 1 class UsersController < ApplicationController
  2. 1 before_action :authenticate_user!
  3. 1 def edit
  4. 9 @user_billing = Billing.find_or_create_by(user_id: current_user.id)
  5. 9 @user_shipping = Shipping.find_or_create_by(user_id: current_user.id)
  6. end
  7. 1 def update
  8. 5 update_user = UserUpdate.call(permitted_params: permitted_params, current_user: current_user)
  9. 5 if update_user.success?
  10. 4 redirect_to edit_user_path, notice: I18n.t('settings.message.update')
  11. else
  12. 1 redirect_to edit_user_path, alert: I18n.t('settings.error.error')
  13. end
  14. end
  15. 1 def destroy
  16. current_user.destroy
  17. redirect_to root_path, notice: I18n.t('devise.registrations.destroyed')
  18. end
  19. 1 def permitted_params
  20. 5 params.permit(
  21. user: %i[password current_password password_confirmation email],
  22. billing: %i[first_name last_name address city zip country phone],
  23. shipping: %i[first_name last_name address city zip country phone]
  24. )
  25. end
  26. end
>>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs)

app/decorators/author_decorator.rb

<<<<<<< HEAD ======= =======

app/helpers/application_helper.rb

>>>>>>> 752f0c0 (Featire specs) =======

app/decorators/author_decorator.rb

>>>>>>> bd8bda4 (Manifest_cache true) =======

app/helpers/application_helper.rb

>>>>>>> 4e81ea2 (Featire specs) =======

app/decorators/author_decorator.rb

>>>>>>> aa7b40c (Manifest_cache true) =======

app/helpers/application_helper.rb

>>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs)

app/controllers/reviews_controller.rb

100.0% lines covered

9 relevant lines. 9 lines covered and 0 lines missed.
    
  1. 1 class ReviewsController < ApplicationController
  2. 1 before_action :authenticate_user!
  3. 1 def create
  4. 2 @review = Review.new(review_params)
  5. 2 return redirect_to book_path(@review.book), notice: I18n.t('review.success') if @review.save
  6. 1 redirect_to book_path(@review.book), alert: @review.errors.full_messages.join(', ')
  7. end
  8. 1 private
  9. 1 def review_params
  10. 2 params.permit(:title, :body, :book_id, :user_id, :rating, :verified)
  11. end
  12. end

app/controllers/users_controller.rb

86.67% lines covered

15 relevant lines. 13 lines covered and 2 lines missed.
    
  1. 1 class UsersController < ApplicationController
  2. 1 before_action :authenticate_user!
  3. 1 def edit
  4. 9 @user_billing = Billing.find_or_create_by(user_id: current_user.id)
  5. 9 @user_shipping = Shipping.find_or_create_by(user_id: current_user.id)
  6. end
  7. 1 def update
  8. 5 update_user = UserUpdate.call(permitted_params: permitted_params, current_user: current_user)
  9. 5 if update_user.success?
  10. 4 redirect_to edit_user_path, notice: I18n.t('settings.message.update')
  11. else
  12. 1 redirect_to edit_user_path, alert: I18n.t('settings.error.error')
  13. end
  14. end
  15. 1 def destroy
  16. current_user.destroy
  17. redirect_to root_path, notice: I18n.t('devise.registrations.destroyed')
  18. end
  19. 1 def permitted_params
  20. 5 params.permit(
  21. user: %i[password current_password password_confirmation email],
  22. billing: %i[first_name last_name address city zip country phone],
  23. shipping: %i[first_name last_name address city zip country phone]
  24. )
  25. end
  26. end
<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price)
======= >>>>>>> 75fa7e1 (Rebased) ======= >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= >>>>>>> 13fca83 (Rebased) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) >>>>>>> 02a399d (Manifest_cache true) =======
>>>>>>> bd8bda4 (Manifest_cache true) =======
>>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 75fa7e1 (Rebased) ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 13fca83 (Rebased)

app/decorators/author_decorator.rb

>>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> 4f4ea3f (Featire specs)

100.0% lines covered

4 relevant lines. 4 lines covered and 0 lines missed.
    
  1. 1 <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) >>>>>>> 4f4ea3f (Featire specs) class AuthorDecorator < Draper::Decorator <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= ======= >>>>>>> 251144b (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD class AuthorDecorator < Draper::Decorator ======= module ApplicationHelper >>>>>>> 752f0c0 (Featire specs) ======= class AuthorDecorator < Draper::Decorator >>>>>>> bd8bda4 (Manifest_cache true) ======= module ApplicationHelper >>>>>>> 4e81ea2 (Featire specs) ======= class AuthorDecorator < Draper::Decorator >>>>>>> aa7b40c (Manifest_cache true) ======= module ApplicationHelper >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 4f4ea3f (Featire specs) ======= class AuthorDecorator < Draper::Decorator >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= ======= <<<<<<< HEAD ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> d245196 (Manifest_cache true)
  2. 1 <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) >>>>>>> 4f4ea3f (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> df37394 (Featire specs) >>>>>>> 4f4ea3f (Featire specs) delegate_all
  3. 1 def full_name
  4. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8480924 (Featire specs)
  5. 3 <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 307f31f (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
  6. 2 ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true)
  7. =======
  8. >>>>>>> d0dc1f1 (Featire specs) 3 =======
  9. 2 >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
  10. 2 >>>>>>> bd8bda4 (Manifest_cache true) =======
  11. 2 >>>>>>> aa7b40c (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) =======
  12. 2 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD =======
  13. 2 >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 824bb2b (Featire specs) =======
  14. 3 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) =======
  15. 3 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 98beee2 (Manifest_cache true) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> c8da2e3 (Fix) ======= =======
  16. 2 >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) =======
  17. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) =======
  18. 3 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> bf137e4 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2179316 (Manifest_cache true) ======= ======= ======= ======= =======
  19. 3 >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD "#{first_name} #{last_name}"
  20. end
  21. end

app/decorators/book_decorator.rb

<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) 100.0% <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 307f31f (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) 90.0% ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> bf137e4 (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) 100.0% ======= 90.0% >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= 90.0% >>>>>>> bd8bda4 (Manifest_cache true) ======= 90.0% >>>>>>> aa7b40c (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= 90.0% >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= 90.0% >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 824bb2b (Featire specs) ======= 100.0% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= 100.0% >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 98beee2 (Manifest_cache true) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> c8da2e3 (Fix) ======= ======= 90.0% >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= >>>>>>> c8da2e3 (Fix) ======= 66.67% >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= 100.0% >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> bf137e4 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) >>>>>>> 2179316 (Manifest_cache true) lines covered

<<<<<<< HEAD 12 relevant lines. 12 lines covered and 0 lines missed. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 12 relevant lines. 12 lines covered and 0 lines missed. ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 98beee2 (Manifest_cache true) ======= >>>>>>> 84d0df6 (Manifest_cache true) ======= >>>>>>> 450f4e3 (Manifest_cache true) ======= >>>>>>> aa3618b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) 10 relevant lines. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) 9 lines covered and 1 lines missed. ======= <<<<<<< HEAD 10 lines covered and 0 lines missed. ======= 9 lines covered and 1 lines missed. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= 9 lines covered and 1 lines missed. >>>>>>> bd8bda4 (Manifest_cache true) ======= 9 lines covered and 1 lines missed. >>>>>>> aa7b40c (Manifest_cache true) ======= 9 lines covered and 1 lines missed. >>>>>>> 183b6c5 (Manifest_cache true) ======= 10 lines covered and 0 lines missed. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 00f8b58 (Manifest_cache true) 12 relevant lines. 12 lines covered and ======= 10 relevant lines. <<<<<<< HEAD 10 lines covered and >>>>>>> 7375d4b (Manifest_cache true) 0 lines missed. <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= 9 lines covered and 1 lines missed. >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 98beee2 (Manifest_cache true) ======= ======= ======= 10 relevant lines. 9 lines covered and 1 lines missed. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= ======= 10 relevant lines. 9 lines covered and 1 lines missed. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= 12 relevant lines. <<<<<<< HEAD 8 lines covered and 4 lines missed. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= ======= ======= 12 lines covered and 0 lines missed. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) 12 relevant lines. 12 lines covered and 0 lines missed. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= 9 lines covered and 1 lines missed. >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) ======= ======= 10 relevant lines. 9 lines covered and 1 lines missed. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= 10 relevant lines. 9 lines covered and 1 lines missed. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) ======= 12 relevant lines. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) 8 lines covered and 4 lines missed. >>>>>>> bf554f4 (Rebased) ======= 12 lines covered and 0 lines missed. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= 8 lines covered and 4 lines missed. >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) >>>>>>> 2179316 (Manifest_cache true)
    
  1. 1 require 'monetize'
  2. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= >>>>>>> 8480924 (Featire specs)
  3. =======
  4. 1 <<<<<<< HEAD ======= =======
  5. >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> 450f4e3 (Manifest_cache true)
  6. =======
  7. 1 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= =======
  8. 1 >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 450f4e3 (Manifest_cache true) =======
  9. >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= =======
  10. >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 13fca83 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) >>>>>>> 13fca83 (Rebased) decorates_association :authors <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 4f4ea3f (Featire specs) ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= decorates_association :authors >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= decorates_association :authors >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= decorates_association :authors >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= decorates_association :authors >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) >>>>>>> 13fca83 (Rebased)
  11. 1 <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 13fca83 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) >>>>>>> 13fca83 (Rebased) decorates_association :categories ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD decorates_association :categories ======= PAGINATION_PER_PAGE = 12 >>>>>>> 752f0c0 (Featire specs) ======= decorates_association :categories >>>>>>> bd8bda4 (Manifest_cache true) ======= PAGINATION_PER_PAGE = 12 >>>>>>> 4e81ea2 (Featire specs) ======= decorates_association :categories >>>>>>> aa7b40c (Manifest_cache true) ======= PAGINATION_PER_PAGE = 12 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 4f4ea3f (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 24b58e6 (Manifest_cache true) class BookDecorator < Draper::Decorator >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD class BookDecorator < Draper::Decorator ======= decorates_association :categories >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) ======= class BookDecorator < Draper::Decorator >>>>>>> bf554f4 (Rebased) >>>>>>> 75fa7e1 (Rebased)
  12. >>>>>>> 9bfbd88 (Featire specs)
  13. 1 class BookDecorator < Draper::Decorator ======= class BookDecorator < Draper::Decorator >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= class BookDecorator < Draper::Decorator ======= decorates_association :categories >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) ======= class BookDecorator < Draper::Decorator >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased)
  14. 1 decorates_association :authors
  15. <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs)
  16. 1 <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) >>>>>>> 4f4ea3f (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> df37394 (Featire specs) >>>>>>> 4f4ea3f (Featire specs) def self.collection_decorator_class
  17. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> aa3618b (Rebased) ======= >>>>>>> 160fb15 (Fix) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 557c1b8 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs)
  18. ======= <<<<<<< HEAD
  19. 30 =======
  20. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) >>>>>>> 8480924 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) =======
  21. >>>>>>> bd8bda4 (Manifest_cache true) =======
  22. >>>>>>> aa7b40c (Manifest_cache true) =======
  23. 31 >>>>>>> 1214e1f (Add login registration pages) =======
  24. >>>>>>> 183b6c5 (Manifest_cache true) =======
  25. 30 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) =======
  26. 56 >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= =======
  27. 31 >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= ======= >>>>>>> 824bb2b (Featire specs) =======
  28. 56 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 49e8a6c (Rebased) =======
  29. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) =======
  30. 58 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) >>>>>>> ae884b4 (Fix) PaginatingDecorator
  31. end
  32. 1 delegate_all ======= Book.first(4) >>>>>>> d0dc1f1 (Featire specs) ======= Book.first(4) >>>>>>> 752f0c0 (Featire specs)
  33. <<<<<<< HEAD <<<<<<< HEAD
  34. 1 def authors_names
  35. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> aa3618b (Rebased) ======= >>>>>>> 160fb15 (Fix) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 557c1b8 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs)
  36. 1 ======= <<<<<<< HEAD
  37. 89 =======
  38. 1 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) >>>>>>> 8480924 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) =======
  39. 1 >>>>>>> bd8bda4 (Manifest_cache true) =======
  40. 1 >>>>>>> aa7b40c (Manifest_cache true) =======
  41. 90 >>>>>>> 1214e1f (Add login registration pages) =======
  42. 1 >>>>>>> 183b6c5 (Manifest_cache true) =======
  43. 89 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) =======
  44. 101 >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= =======
  45. 90 >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= ======= >>>>>>> 824bb2b (Featire specs) =======
  46. 101 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 49e8a6c (Rebased) =======
  47. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) =======
  48. 105 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) >>>>>>> ae884b4 (Fix) authors.map(&:full_name).join(', ')
  49. ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) end
  50. <<<<<<< HEAD <<<<<<< HEAD
  51. 1 def categories_names
  52. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  53. 12 =======
  54. 8 >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 557c1b8 (Fix)
  55. 8 =======
  56. 12 >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= =======
  57. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= =======
  58. 12 >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) categories.pluck(:name).join(', ')
  59. end <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs)
  60. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs)
  61. 1 def price <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 824bb2b (Featire specs)
  62. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs)
  63. 121 Money.new(price_cents)
  64. <<<<<<< HEAD =======
  65. >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) end
  66. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) =======
  67. 1 def price >>>>>>> 8480924 (Featire specs)
  68. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  69. 125 ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD
  70. 121 =======
  71. 125 >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= =======
  72. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= =======
  73. 125 >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) Money.new(price_cents)
  74. end
  75. <<<<<<< HEAD ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 557c1b8 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix)

app/decorators/paginating_decorator.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 class PaginatingDecorator < Draper::CollectionDecorator <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs)
  2. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
  3. ======= <<<<<<< HEAD ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs)
  4. 1 delegate :current_page, :per_page, :offset, :total_entries, :total_pages
  5. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs)
  6. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
  7. >>>>>>> bd8bda4 (Manifest_cache true) =======
  8. >>>>>>> aa7b40c (Manifest_cache true) =======
  9. >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) end
  10. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8480924 (Featire specs)

app/decorators/review_decorator.rb

100.0% lines covered

4 relevant lines. 4 lines covered and 0 lines missed.
    
    <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) =======

app/decorators/review_decorator.rb

100.0% lines covered

4 relevant lines. 4 lines covered and 0 lines missed.
    
    >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs)
  1. 1 class ReviewDecorator < Draper::Decorator
  2. 1 delegate_all
  3. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8480924 (Featire specs)
  4. 1 def date_time
  5. 1 created_at.strftime('%m/%d/%Y')
  6. end
  7. end

app/decorators/user_decorator.rb

100.0% lines covered

5 relevant lines. 5 lines covered and 0 lines missed.
    
  1. 1 class UserDecorator < Draper::Decorator
  2. 1 delegate_all
  3. 1 def name_or_email
  4. 2 return name if name.present?
  5. 2 email.split('@').first.capitalize
  6. end
  7. end
  8. <<<<<<< HEAD ======= ======= ======= >>>>>>> 9a49b7b (Rebased) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) =======
  9. 1 def date_time
  10. 1 created_at.strftime('%m/%d/%Y')
  11. end
  12. end
  13. >>>>>>> 8480924 (Featire specs)
<<<<<<< HEAD =======

app/decorators/user_decorator.rb

100.0% lines covered

5 relevant lines. 5 lines covered and 0 lines missed.
    
  1. 1 class UserDecorator < Draper::Decorator
  2. 1 delegate_all
  3. 1 def name_or_email
  4. 2 return name if name.present?
  5. 2 email.split('@').first.capitalize
  6. end
  7. end
  8. >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 824bb2b (Featire specs)
======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) >>>>>>> 13fca83 (Rebased)
=======
>>>>>>> a5d032d (Fix)

app/decorators/paginating_decorator.rb

<<<<<<< HEAD <<<<<<< HEAD 100.0% <<<<<<< HEAD ======= ======= 100.0% >>>>>>> 872e675 (Fix) lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 557c1b8 (Fix) 2 relevant lines. 2 lines covered and ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) 3 relevant lines. 3 lines covered and ======= 4 relevant lines. 4 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= 4 relevant lines. 4 lines covered and >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) ======= 2 relevant lines. 2 lines covered and >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= 2 relevant lines. 2 lines covered and >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) 0 lines missed.
    
  1. 1 <<<<<<< HEAD <<<<<<< HEAD class PaginatingDecorator < Draper::CollectionDecorator ======= module ApplicationHelper <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= class PaginatingDecorator < Draper::CollectionDecorator >>>>>>> c8da2e3 (Fix)
  2. 1 <<<<<<< HEAD <<<<<<< HEAD delegate :current_page, :per_page, :offset, :total_entries, :total_pages ======= <<<<<<< HEAD def markdown(text) ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= delegate :current_page, :per_page, :offset, :total_entries, :total_pages >>>>>>> 872e675 (Fix)
  3. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix)
  4. end

app/decorators/review_decorator.rb

100.0% <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= 75.0% >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) lines covered

4 relevant lines. <<<<<<< HEAD 3 lines covered and <<<<<<< HEAD ======= 4 relevant lines. 4 lines covered and >>>>>>> d0dc1f1 (Featire specs) ======= 4 relevant lines. 4 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 4 relevant lines. 4 lines covered and <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 4e81ea2 (Featire specs) ======= 4 relevant lines. 4 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= 4 lines covered and >>>>>>> 872e675 (Fix) 0 lines missed.
    
  1. 1 <<<<<<< HEAD <<<<<<< HEAD module ApplicationHelper <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= <<<<<<< HEAD class ReviewDecorator < Draper::Decorator >>>>>>> b28889f (Fix) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= class ReviewDecorator < Draper::Decorator >>>>>>> 872e675 (Fix)
  2. 1 <<<<<<< HEAD <<<<<<< HEAD delegate :current_page, :per_page, :offset, :total_entries, :total_pages ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) def markdown(text) ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD ======= ======= delegate_all ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD delegate_all >>>>>>> b28889f (Fix) ======= >>>>>>> 563720e (Featire specs) ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 4e81ea2 (Featire specs) ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= delegate_all >>>>>>> 872e675 (Fix)
  3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 872e675 (Fix)
  4. 1 <<<<<<< HEAD <<<<<<< HEAD def full_name ======= def date_time >>>>>>> b28889f (Fix) ======= def date_time >>>>>>> 872e675 (Fix)
  5. <<<<<<< HEAD <<<<<<< HEAD
  6. 2 =======
  7. 1 >>>>>>> b28889f (Fix) =======
  8. 1 >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD "#{first_name} #{last_name}" ======= created_at.strftime('%m/%d/%Y') >>>>>>> b28889f (Fix) ======= created_at.strftime('%m/%d/%Y') >>>>>>> 872e675 (Fix)
  9. end
  10. end
<<<<<<< HEAD <<<<<<< HEAD

app/decorators/book_decorator.rb

90.0% ======= ======= >>>>>>> 872e675 (Fix)

app/decorators/user_decorator.rb

100.0% <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) lines covered

<<<<<<< HEAD <<<<<<< HEAD 10 relevant lines. 9 lines covered and ======= >>>>>>> 49e8a6c (Rebased) 1 lines missed. ======= ======= >>>>>>> 872e675 (Fix) 5 relevant lines. 5 lines covered and 0 lines missed.
    
  1. 1 class UserDecorator < Draper::Decorator
  2. 1 delegate_all
  3. 1 def name_or_email
  4. 2 return name if name.present?
  5. 2 email.split('@').first.capitalize
  6. end
  7. =======
  8. >>>>>>> d0dc1f1 (Featire specs) =======
  9. >>>>>>> 752f0c0 (Featire specs) end

app/helpers/application_helper.rb

<<<<<<< HEAD =======

app/decorators/author_decorator.rb

>>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs)

100.0% lines covered

4 relevant lines. 4 lines covered and 0 lines missed. <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix)
    
  1. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD require 'image_processing' ======= module ApplicationHelper >>>>>>> d0dc1f1 (Featire specs) ======= class AuthorDecorator < Draper::Decorator >>>>>>> 02a399d (Manifest_cache true) ======= module ApplicationHelper >>>>>>> 752f0c0 (Featire specs)
  2. <<<<<<< HEAD <<<<<<< HEAD
  3. =======
  4. 1 >>>>>>> d0dc1f1 (Featire specs) =======
  5. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> d0dc1f1 (Featire specs) ======= delegate_all
  6. 1 def full_name
  7. 2 "#{first_name} #{last_name}"
  8. end
  9. end

app/decorators/book_decorator.rb

90.0% lines covered

10 relevant lines. 9 lines covered and 1 lines missed.
    
  1. 1 class BookDecorator < Draper::Decorator
  2. 1 decorates_association :authors >>>>>>> 02a399d (Manifest_cache true) ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 752f0c0 (Featire specs)
  3. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD decorates_association :authors >>>>>>> 02a399d (Manifest_cache true) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs)
  4. end

app/decorators/review_decorator.rb

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD 3 relevant lines. 3 lines covered and ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 3 relevant lines. 3 lines covered and ======= 4 relevant lines. 4 lines covered and >>>>>>> d0dc1f1 (Featire specs) ======= 4 relevant lines. 4 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 4 relevant lines. 4 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 4 relevant lines. 4 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509ee (Featire specs) 0 lines missed.
    
  1. 1 module ApplicationHelper <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509ee (Featire specs)
  2. 1 <<<<<<< HEAD def markdown(text) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD def markdown(text) ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> d0dc1f1 (Featire specs) ======= delegate_all ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 752f0c0 (Featire specs) ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 4e81ea2 (Featire specs) ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509ee (Featire specs)
  3. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  4. 1 def full_name
  5. 2 "#{first_name} #{last_name}"
  6. end
  7. end

app/decorators/book_decorator.rb

90.0% lines covered

10 relevant lines. 9 lines covered and ======= 4 relevant lines. <<<<<<< HEAD 3 lines covered and >>>>>>> 75fa7e1 (Rebased) 1 lines missed. ======= 4 lines covered and 0 lines missed.
    
  1. 1 class ReviewDecorator < Draper::Decorator ======= ======= ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) module ApplicationHelper >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased)
  2. <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD
  3. 1 ======= =======
  4. 12 =======
  5. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD Markdown.new(text).to_html ======= def markdown(text) >>>>>>> 49e8a6c (Rebased)
  6. >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  7. =======
  8. 13 <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= =======
  9. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= =======
  10. 13 >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD delegate_all
  11. 1 def date_time
  12. 1 created_at.strftime('%m/%d/%Y') ======= Markdown.new(text).to_html.html_safe >>>>>>> c8da2e3 (Fix)
  13. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) end
  14. <<<<<<< HEAD end

app/decorators/user_decorator.rb

100.0% lines covered

5 relevant lines. 5 lines covered and 0 lines missed.
    
  1. 1 class UserDecorator < Draper::Decorator
  2. 1 delegate_all
  3. 1 def name_or_email
  4. 2 return name if name.present?
  5. 2 email.split('@').first.capitalize
  6. end
  7. end
======= >>>>>>> 824bb2b (Featire specs)

app/helpers/application_helper.rb

100.0% lines covered

<<<<<<< HEAD 4 relevant lines. 4 lines covered and ======= <<<<<<< HEAD 3 relevant lines. 3 lines covered and ======= 4 relevant lines. 4 lines covered and >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) 0 lines missed. >>>>>>> 67ab529 (Fix)
    
  1. 1 <<<<<<< HEAD require 'image_processing'
  2. 1 ======= >>>>>>> 824bb2b (Featire specs) module ApplicationHelper
  3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs)
  4. 12 ======= ======= >>>>>>> 8480924 (Featire specs)
  5. =======
  6. >>>>>>> 824bb2b (Featire specs) 1 >>>>>>> 75fa7e1 (Rebased) <<<<<<< HEAD <<<<<<< HEAD Markdown.new(text).to_html ======= def markdown(text) >>>>>>> 75fa7e1 (Rebased) ======= def markdown(text) ======= <<<<<<< HEAD def markdown(text) ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs)
  7. <<<<<<< HEAD
  8. 13 ======= <<<<<<< HEAD
  9. 12 >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD Markdown.new(text).to_html.html_safe ======= Markdown.new(text).to_html >>>>>>> 824bb2b (Featire specs)
  10. <<<<<<< HEAD
  11. =======
  12. >>>>>>> 824bb2b (Featire specs) end
  13. <<<<<<< HEAD
  14. =======
  15. >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 311e9fa (Rebased) end

app/helpers/constants.rb

100.0% lines covered

21 relevant lines. 21 lines covered and 0 lines missed.
    
  1. 1 module Constants
  2. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8480924 (Featire specs) ======= >>>>>>> 13fca83 (Rebased) ======= ======= >>>>>>> 311e9fa (Rebased) =======
  3. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  4. >>>>>>> 752f0c0 (Featire specs) =======
  5. >>>>>>> 4e81ea2 (Featire specs) =======
  6. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= =======
  7. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509ee (Featire specs) ======= >>>>>>> 75fa7e1 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 365d41e (Featire specs) ======= >>>>>>> c05ee51 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= =======
  8. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) =======
  9. >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= =======
  10. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
  11. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= =======
  12. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) >>>>>>> 13fca83 (Rebased) 1 ======= >>>>>>> d0dc1f1 (Featire specs) PAGINATION_PER_PAGE = 12 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> 13fca83 (Rebased) ======= >>>>>>> 0341d6d (Manifest_cache true) ======= <<<<<<< HEAD ======= decorates_association :categories >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= >>>>>>> 75fa7e1 (Rebased) ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= decorates_association :categories >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6d (Manifest_cache true) ======= ======= ======= PAGINATION_PER_PAGE = 12 >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 1ca9c0e (Featire specs)
  13. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= >>>>>>> 34509ee (Featire specs) ======= >>>>>>> 75fa7e1 (Rebased) ======= >>>>>>> 8480924 (Featire specs) ======= >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41e (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> 13fca83 (Rebased) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 1ca9c0e (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 1ca9c0e (Featire specs)
  14. ======= <<<<<<< HEAD
  15. =======
  16. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= =======
  17. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) =======
  18. >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= =======
  19. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= =======
  20. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= =======
  21. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs)
  22. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs)
  23. 1 STAR_MIN = 0
  24. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 77d62af (Featire specs)
  25. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> b719333 (Manifest_cache true) ======= >>>>>>> 77d62af (Featire specs) STAR_MAX = 5 ======= def self.collection_decorator_class >>>>>>> 02a399d (Manifest_cache true)
  26. <<<<<<< HEAD <<<<<<< HEAD
  27. =======
  28. =======
  29. 30 =======
  30. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) PaginatingDecorator
  31. end
  32. >>>>>>> 02a399d (Manifest_cache true)
  33. <<<<<<< HEAD
  34. 1 CATALOG_BOOK_COUNT = 3
  35. 1 BEST_SELLER_COUNT = 4
  36. ======= >>>>>>> 02a399d (Manifest_cache true)
  37. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= delegate_all
  38. 1 def authors_names
  39. <<<<<<< HEAD
  40. 1 ======= <<<<<<< HEAD
  41. 89 =======
  42. 1 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) authors.map(&:full_name).join(', ')
  43. end
  44. 1 def categories_names
  45. 1 categories.map(&:name).join(', ')
  46. end
  47. end

app/decorators/category_decorator.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 class CategoryDecorator < Draper::Decorator
  2. 1 delegate_all
  3. <<<<<<< HEAD ======= <<<<<<< HEAD end

app/decorators/paginating_decorator.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 class PaginatingDecorator < Draper::CollectionDecorator ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true)
  2. <<<<<<< HEAD
  3. ======= <<<<<<< HEAD
  4. 1 delegate :current_page, :per_page, :offset, :total_entries, :total_pages
  5. =======
  6. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) end
  7. <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 7375d4b (Manifest_cache true)
  8. <<<<<<< HEAD ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true)

app/helpers/application_helper.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 module ApplicationHelper ======= >>>>>>> bd8bda4 (Manifest_cache true)
  2. 1 <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 77d62af (Featire specs) DESCRIPTION_LENGTH = 25 ======= delegate_all
  3. 1 def full_name
  4. 2 "#{first_name} #{last_name}"
  5. end
  6. end

app/decorators/book_decorator.rb

90.0% lines covered

10 relevant lines. 9 lines covered and 1 lines missed.
    
  1. 1 class BookDecorator < Draper::Decorator
  2. 1 decorates_association :authors >>>>>>> bd8bda4 (Manifest_cache true)
  3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> b719333 (Manifest_cache true) ======= >>>>>>> 77d62af (Featire specs)
  4. 1 <<<<<<< HEAD MIN_PRICE_IN_CENTS = 0 ======= decorates_association :categories >>>>>>> bd8bda4 (Manifest_cache true)
  5. 1 <<<<<<< HEAD <<<<<<< HEAD MAX_PRICE_IN_CENTS = 50_000 ======= MAX_PRICE_IN_CENTS = 10_000 >>>>>>> 824bb2b (Featire specs) ======= MAX_PRICE_IN_CENTS = 50_000 >>>>>>> 311e9fa (Rebased)
  6. 1 TEXT_FORMAT = %r{\A[A-Za-z0-9!#$%&'*+-/=?^_`{|}~. ]+\z}.freeze
  7. 1 NAME_FORMAT = /\A[A-Za-z]+\z/.freeze
  8. 1 COUNTY_FORMAT = /\A[A-Za-z ]+\z/.freeze
  9. 1 PHONE_FORMAT = /\A[\\+]?[(]?[0-9]{3}[)]?[-\s\\.]?[0-9]{3}[-\s\\.]?[0-9]{4,6}\z/.freeze
  10. 1 ZIP_FORMAT = /\A[0-9]+\z/.freeze
  11. 1 VALIDATES_NAME_LENGTH_MAX = 50
  12. 1 VALIDATES_TEXT_LENGTH_MAX = 500
  13. 1 VALIDATES_TITLE_LENGTH_MAX = 80
  14. 1 VALIDATES_PHONE_LENGTH_MAX = 15
  15. 1 VALIDATES_ZIP_LENGTH_MAX = 10
  16. 1 FOOTER_NUMBER = '(555)-555-5555'.freeze
  17. 1 FOOTER_EMAIL = 'support@bookstore.com'.freeze
  18. end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 67ab529 (Fix) ======= >>>>>>> 13fca83 (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> ae884b4 (Fix)

app/interactors/billing_update.rb

87.5% lines covered

8 relevant lines. 7 lines covered and 1 lines missed.
    
  1. 1 class BillingUpdate
  2. 1 include Interactor
  3. 1 def call
  4. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> b28889f (Fix) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> 872e675 (Fix)
  5. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> d782a28 (Manifest_cache true) params = context.permitted_params ======= def self.collection_decorator_class
  6. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= >>>>>>> ae884b4 (Fix) ======= >>>>>>> d245196 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD
  7. ======= <<<<<<< HEAD
  8. 30 =======
  9. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) =======
  10. 31 >>>>>>> 1214e1f (Add login registration pages) =======
  11. >>>>>>> d782a28 (Manifest_cache true) PaginatingDecorator
  12. end
  13. 1 delegate_all
  14. 1 def authors_names
  15. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  16. 1 ======= <<<<<<< HEAD
  17. 89 =======
  18. 1 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) =======
  19. 90 >>>>>>> 1214e1f (Add login registration pages) =======
  20. 1 >>>>>>> d782a28 (Manifest_cache true) authors.map(&:full_name).join(', ')
  21. end
  22. 1 def categories_names
  23. 1 categories.map(&:name).join(', ')
  24. end
  25. end

app/decorators/category_decorator.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 class CategoryDecorator < Draper::Decorator
  2. 1 delegate_all
  3. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD end

app/decorators/paginating_decorator.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 class PaginatingDecorator < Draper::CollectionDecorator ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> d782a28 (Manifest_cache true)
  2. <<<<<<< HEAD <<<<<<< HEAD
  3. ======= <<<<<<< HEAD
  4. 1 delegate :current_page, :per_page, :offset, :total_entries, :total_pages
  5. =======
  6. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) =======
  7. >>>>>>> d782a28 (Manifest_cache true) end
  8. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> d782a28 (Manifest_cache true)
  9. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> d782a28 (Manifest_cache true)

app/helpers/application_helper.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 module ApplicationHelper <<<<<<< HEAD ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> d782a28 (Manifest_cache true)
  2. 1 <<<<<<< HEAD <<<<<<< HEAD DESCRIPTION_LENGTH = 25 >>>>>>> 02a399d (Manifest_cache true) ======= delegate_all
  3. 1 def full_name
  4. 2 =======
  5. 3 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) "#{first_name} #{last_name}"
  6. end
  7. end

app/decorators/book_decorator.rb

100.0% lines covered

10 relevant lines. 10 lines covered and 0 lines missed.
    
  1. 1 class BookDecorator < Draper::Decorator
  2. 1 decorates_association :authors ======= DESCRIPTION_LENGTH = 25 >>>>>>> d782a28 (Manifest_cache true) >>>>>>> bd8bda4 (Manifest_cache true)
  3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f92 (Add login registration pages) ======= >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> d245196 (Manifest_cache true) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> d245196 (Manifest_cache true)
  4. 1 user = context.current_user
  5. 1 return if params[:billing].nil?
  6. 1 return if user.billing.update(params[:billing])
  7. context.fail!
  8. end
  9. end

app/interactors/shipping_update.rb

87.5% lines covered

8 relevant lines. 7 lines covered and 1 lines missed.
    
  1. 1 class ShippingUpdate
  2. 1 include Interactor
  3. 1 def call
  4. 1 params = context.permitted_params
  5. 1 user = context.current_user
  6. 1 return if params[:shipping].nil?
  7. 1 return if user.shipping.update(params[:shipping])
  8. context.fail!
  9. end
  10. end

app/interactors/user_update.rb

100.0% lines covered

13 relevant lines. 13 lines covered and 0 lines missed.
    
  1. 1 class UserUpdate
  2. 1 include Interactor
  3. 1 def call
  4. 5 params = context.permitted_params
  5. 5 user = context.current_user
  6. 5 billing_and_shipping_update(params, user)
  7. 5 return if params[:user].nil?
  8. 3 return if !params[:user][:email].nil? && user.update(email: params[:user][:email])
  9. 2 return if !params[:user][:password].nil? &&
  10. user.reset_password(params[:user][:password], params[:user][:password_confirmation])
  11. 1 context.fail!
  12. end
  13. 1 def billing_and_shipping_update(params, user)
  14. 5 return if !params[:billing].nil? && BillingUpdate.call(permitted_params: params, current_user: user)
  15. 4 !params[:shipping].nil? && ShippingUpdate.call(permitted_params: params, current_user: user)
  16. end
  17. end

app/models/address.rb

100.0% lines covered

7 relevant lines. 7 lines covered and 0 lines missed.
    
  1. 1 class Address < ApplicationRecord
  2. 1 belongs_to :user
  3. 1 validates :first_name, :last_name,
  4. length: { maximum: Constants::VALIDATES_NAME_LENGTH_MAX }, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= =======

app/helpers/application_helper.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 module ApplicationHelper ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 490b01d (Manifest_cache true)
  2. <<<<<<< HEAD
  3. =======
  4. 1 <<<<<<< HEAD >>>>>>> bd8bda4 (Manifest_cache true) ======= delegate_all
  5. 1 def full_name
  6. 2 "#{first_name} #{last_name}" ======= >>>>>>> 67ab529 (Fix) ======= ======= DESCRIPTION_LENGTH = 25 >>>>>>> 752f0c0 (Featire specs) >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> c05ee51 (Featire specs) ======= >>>>>>> ae884b4 (Fix) ======= <<<<<<< HEAD ======= =======

app/helpers/application_helper.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 module ApplicationHelper ======= >>>>>>> aa7b40c (Manifest_cache true)
  2. 1 <<<<<<< HEAD >>>>>>> bd8bda4 (Manifest_cache true) ======= delegate_all
  3. 1 def full_name
  4. 2 "#{first_name} #{last_name}" ======= >>>>>>> 872e675 (Fix)
  5. ======= >>>>>>> 752f0c0 (Featire specs)
  6. =======
  7. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD end
  8. end

app/decorators/book_decorator.rb

90.0% lines covered

10 relevant lines. 9 lines covered and 1 lines missed.
    
  1. 1 class BookDecorator < Draper::Decorator
  2. 1 decorates_association :authors
  3. 1 decorates_association :categories
  4. ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs)
  5. 1 <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD def self.collection_decorator_class ======= >>>>>>> e5752db (Featire specs) def self.collection_decorator_class <<<<<<< HEAD ======= ======= def self.collection_decorator_class
  6. 31 PaginatingDecorator
  7. end
  8. 1 delegate_all
  9. 1 def authors_names
  10. 90 authors.map(&:full_name).join(', ')
  11. end
  12. 1 def categories_names
  13. 1 categories.map(&:name).join(', ')
  14. end
  15. end

app/decorators/category_decorator.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 class CategoryDecorator < Draper::Decorator
  2. 1 delegate_all
  3. end

app/decorators/paginating_decorator.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 class PaginatingDecorator < Draper::CollectionDecorator
  2. 1 delegate :current_page, :per_page, :offset, :total_entries, :total_pages
  3. end

app/helpers/application_helper.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 module ApplicationHelper
  2. 1 DESCRIPTION_LENGTH = 25 >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
  3. <<<<<<< HEAD =======
  4. 31 PaginatingDecorator
  5. end
  6. 1 delegate_all
  7. 1 def authors_names
  8. 90 authors.map(&:full_name).join(', ')
  9. end
  10. 1 def categories_names
  11. 1 categories.map(&:name).join(', ')
  12. end
  13. end

app/decorators/category_decorator.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 class CategoryDecorator < Draper::Decorator
  2. 1 delegate_all
  3. end

app/decorators/paginating_decorator.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 class PaginatingDecorator < Draper::CollectionDecorator
  2. 1 delegate :current_page, :per_page, :offset, :total_entries, :total_pages
  3. end

app/helpers/application_helper.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 module ApplicationHelper
  2. 1 DESCRIPTION_LENGTH = 25 >>>>>>> 183b6c5 (Manifest_cache true) ======= DESCRIPTION_LENGTH = 25 >>>>>>> 7a02bbe (Featire specs)
  3. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs)
  4. PaginatingDecorator
  5. end
  6. 1 delegate_all
  7. 1 def authors_names
  8. 1 authors.map(&:full_name).join(', ')
  9. end
  10. 1 def categories_names
  11. 1 categories.map(&:name).join(', ')
  12. end
  13. end

app/decorators/category_decorator.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 class CategoryDecorator < Draper::Decorator
  2. 1 delegate_all
  3. end

app/helpers/application_helper.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 module ApplicationHelper
  2. 1 >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) DESCRIPTION_LENGTH = 25 >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= DESCRIPTION_LENGTH = 25 <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= DESCRIPTION_LENGTH = 25 >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> fc3774f (Featire specs)
  3. <<<<<<< HEAD
  4. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  5. >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end
  6. end

app/decorators/book_decorator.rb

90.0% lines covered

10 relevant lines. 9 lines covered and 1 lines missed.
    
  1. 1 class BookDecorator < Draper::Decorator
  2. 1 decorates_association :authors
  3. 1 decorates_association :categories
  4. ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs)
  5. 1 <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD def self.collection_decorator_class ======= >>>>>>> 34509ee (Featire specs) def self.collection_decorator_class <<<<<<< HEAD ======= ======= def self.collection_decorator_class
  6. 31 PaginatingDecorator
  7. end
  8. 1 delegate_all
  9. 1 def authors_names
  10. 90 authors.map(&:full_name).join(', ')
  11. end
  12. 1 def categories_names
  13. 1 categories.map(&:name).join(', ')
  14. end
  15. end

app/decorators/category_decorator.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 class CategoryDecorator < Draper::Decorator
  2. 1 delegate_all
  3. end

app/decorators/paginating_decorator.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 class PaginatingDecorator < Draper::CollectionDecorator
  2. 1 delegate :current_page, :per_page, :offset, :total_entries, :total_pages
  3. end

app/helpers/application_helper.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 module ApplicationHelper
  2. 1 DESCRIPTION_LENGTH = 25 >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price)
  3. <<<<<<< HEAD =======
  4. 31 PaginatingDecorator
  5. end
  6. 1 delegate_all
  7. 1 def authors_names
  8. 90 authors.map(&:full_name).join(', ')
  9. end
  10. 1 def categories_names
  11. 1 categories.map(&:name).join(', ')
  12. end
  13. end

app/decorators/category_decorator.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 class CategoryDecorator < Draper::Decorator
  2. 1 delegate_all
  3. end

app/decorators/paginating_decorator.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 class PaginatingDecorator < Draper::CollectionDecorator
  2. 1 delegate :current_page, :per_page, :offset, :total_entries, :total_pages
  3. end

app/helpers/application_helper.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 module ApplicationHelper
  2. 1 DESCRIPTION_LENGTH = 25 >>>>>>> 183b6c5 (Manifest_cache true) ======= DESCRIPTION_LENGTH = 25 >>>>>>> 7a02bbe (Featire specs)
  3. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 34509ee (Featire specs)
  4. PaginatingDecorator
  5. end
  6. 1 delegate_all
  7. 1 def authors_names
  8. 1 authors.map(&:full_name).join(', ')
  9. end
  10. 1 def categories_names
  11. 1 categories.map(&:name).join(', ')
  12. end
  13. end

app/decorators/category_decorator.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 class CategoryDecorator < Draper::Decorator
  2. 1 delegate_all
  3. end

app/helpers/application_helper.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 module ApplicationHelper
  2. 1 >>>>>>> aa7b40c (Manifest_cache true) DESCRIPTION_LENGTH = 25 >>>>>>> 752f0c0 (Featire specs) ======= DESCRIPTION_LENGTH = 25 >>>>>>> 4e81ea2 (Featire specs) ======= DESCRIPTION_LENGTH = 25 >>>>>>> 08edf50 (Featire specs)
  3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  4. >>>>>>> 490b01d (Manifest_cache true) ======= >>>>>>> 67ab529 (Fix) ======= >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> 5a2009f (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 1ca9c0e (Featire specs) format: { with: Constants::NAME_FORMAT,
  5. message: 'Please enter first or last in correct format' }, allow_blank: true
  6. 1 validates :phone,
  7. length: { maximum: Constants::VALIDATES_PHONE_LENGTH_MAX },
  8. format: { with: Constants::PHONE_FORMAT,
  9. message: 'Please enter phone in correct format' }, allow_blank: true
  10. 1 validates :address,
  11. length: { maximum: Constants::VALIDATES_TITLE_LENGTH_MAX },
  12. format: { with: Constants::TEXT_FORMAT,
  13. message: 'Please enter address in correct format' }, allow_blank: true
  14. 1 validates :country, :city,
  15. length: { maximum: Constants::VALIDATES_TITLE_LENGTH_MAX },
  16. format: { with: Constants::COUNTY_FORMAT,
  17. message: 'Please enter country in correct format' }, allow_blank: true
  18. 1 validates :zip,
  19. length: { maximum: Constants::VALIDATES_ZIP_LENGTH_MAX },
  20. format: { with: Constants::ZIP_FORMAT,
  21. message: 'Please enter zip in correct format' }, allow_blank: true
  22. end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 75fa7e1 (Rebased) ======= >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 13fca83 (Rebased) ======= ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) >>>>>>> ae884b4 (Fix)

app/models/admin_user.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 class AdminUser < ApplicationRecord
  2. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 4f4ea3f (Featire specs) # Include default devise modules. Others available are: ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) DESCRIPTION_LENGTH = 25 >>>>>>> df37394 (Featire specs)
  3. <<<<<<< HEAD
  4. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  5. =======
  6. >>>>>>> 752f0c0 (Featire specs) =======
  7. >>>>>>> bd8bda4 (Manifest_cache true) =======
  8. >>>>>>> 4e81ea2 (Featire specs) =======
  9. >>>>>>> aa7b40c (Manifest_cache true) =======
  10. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
  11. 1 <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD # Include default devise modules. Others available are: ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) DESCRIPTION_LENGTH = 25 <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= ======= devise :database_authenticatable, >>>>>>> 9a49b7b (Rebased) ======= ======= devise :database_authenticatable, >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs)
  12. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs)
  13. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  14. ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) >>>>>>> f136376 (Featire specs)
  15. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) >>>>>>> 0341d6d (Manifest_cache true) >>>>>>> 752f0c0 (Featire specs) =======
  16. >>>>>>> bd8bda4 (Manifest_cache true) =======
  17. >>>>>>> 4e81ea2 (Featire specs) =======
  18. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 9440753 (Featire specs) =======
  19. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= =======
  20. >>>>>>> 08edf50 (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= =======
  21. >>>>>>> c033601 (Rebased) <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> e5890c2 (Manifest_cache true)
  22. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= =======
  23. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= ======= >>>>>>> 251144b (Manifest_cache true) ======= >>>>>>> fc3774f (Featire specs) ======= =======
  24. >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= =======
  25. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
  26. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= =======
  27. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) =======
  28. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= >>>>>>> 34509ee (Featire specs) ======= >>>>>>> 75fa7e1 (Rebased) ======= >>>>>>> 8480924 (Featire specs) ======= >>>>>>> d8dd3b4 (Featire specs) # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
  29. 1 devise :database_authenticatable,
  30. :recoverable, :rememberable, :validatable
  31. ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 86d584a (Manifest_cache true) ======= ======= =======
  32. >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= =======
  33. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
  34. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= ======= =======
  35. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) =======
  36. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= ======= =======
  37. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> 13fca83 (Rebased) ======= >>>>>>> 1ca9c0e (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> 4d90e3d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs) end

app/models/application_record.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 class ApplicationRecord < ActiveRecord::Base
  2. 1 self.abstract_class = true
  3. end

app/models/author.rb

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8480924 (Featire specs) ======= >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41e (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> 13fca83 (Rebased) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 1ca9c0e (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 1ca9c0e (Featire specs) 4 relevant lines. 4 lines covered and ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8480924 (Featire specs) 4 relevant lines. 4 lines covered and ======= 5 relevant lines. 5 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= 5 relevant lines. 5 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 5 relevant lines. 5 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 5 relevant lines. 5 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= 5 relevant lines. 5 lines covered and >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509ee (Featire specs) ======= 4 relevant lines. 4 lines covered and >>>>>>> 75fa7e1 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 365d41e (Featire specs) ======= >>>>>>> c05ee51 (Featire specs) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 1ca9c0e (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= 5 relevant lines. 5 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 77d62af (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= 5 relevant lines. 5 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 5 relevant lines. 5 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= 5 relevant lines. 5 lines covered and >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs) 0 lines missed.
    
  1. 1 class Author < ApplicationRecord
  2. 1 has_many :authors_books, dependent: :destroy
  3. 1 has_many :books, through: :authors_books
  4. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41e (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> 13fca83 (Rebased) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 1ca9c0e (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 1ca9c0e (Featire specs) validates :first_name, :last_name, presence: true ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= validates :first_name, :last_name, presence: true ======= <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) validates :first_name, :last_name, presence: true ======= validates :first_name, presence: true >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= validates :first_name, presence: true >>>>>>> 752f0c0 (Featire specs) ======= validates :first_name, presence: true >>>>>>> 4e81ea2 (Featire specs) ======= validates :first_name, presence: true >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= validates :first_name, presence: true >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509ee (Featire specs)
  5. <<<<<<< HEAD
  6. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  7. ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs)
  8. 1 validates :last_name, presence: true
  9. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509ee (Featire specs) end

app/models/authors_book.rb

100.0% lines covered

4 relevant lines. 4 lines covered and 0 lines missed.
    
  1. 1 class AuthorsBook < ApplicationRecord
  2. 1 belongs_to :author
  3. 1 belongs_to :book
  4. 1 validates :author, :book, presence: true ======= validates :first_name, :last_name, presence: true >>>>>>> 75fa7e1 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 365d41e (Featire specs) ======= >>>>>>> c05ee51 (Featire specs) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 1ca9c0e (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= validates :first_name, presence: true >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= validates :first_name, presence: true >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= validates :first_name, presence: true <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= validates :first_name, presence: true >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= validates :first_name, presence: true >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> d8abfed (Featire specs)
  5. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs)
  6. ======= <<<<<<< HEAD <<<<<<< HEAD
  7. ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD
  8. ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs)
  9. 1 validates :last_name, presence: true
  10. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= >>>>>>> 34509ee (Featire specs) =======

app/models/authors_book.rb

100.0% lines covered

4 relevant lines. 4 lines covered and 0 lines missed.
    
  1. 1 class AuthorsBook < ApplicationRecord
  2. 1 belongs_to :author
  3. 1 belongs_to :book
  4. 1 validates :author, :book, presence: true ======= validates :first_name, :last_name, presence: true >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= validates :first_name, presence: true >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs)
  5. <<<<<<< HEAD <<<<<<< HEAD
  6. ======= ======= >>>>>>> 752f0c0 (Featire specs)
  7. 1 validates :last_name, presence: true
  8. <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> d8dd3b4 (Featire specs) ======= >>>>>>> 5a2009f (Fix) ======= >>>>>>> 365d41e (Featire specs) ======= >>>>>>> c05ee51 (Featire specs) ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> 13fca83 (Rebased) ======= >>>>>>> ae884b4 (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix)

app/models/authors_book.rb

100.0% lines covered

4 relevant lines. 4 lines covered and 0 lines missed.
    
  1. 1 class AuthorsBook < ApplicationRecord
  2. 1 belongs_to :author
  3. 1 belongs_to :book
  4. 1 validates :author, :book, presence: true
  5. end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs)

app/models/billing.rb

100.0% lines covered

1 relevant lines. 1 lines covered and 0 lines missed.
    
  1. 1 class Billing < Address
  2. end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509ee (Featire specs) ======= >>>>>>> 75fa7e1 (Rebased) ======= >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> 5a2009f (Fix) ======= >>>>>>> 365d41e (Featire specs) ======= >>>>>>> ae884b4 (Fix) ======= >>>>>>> f136376 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs)

app/models/book.rb

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 8 relevant lines. 8 lines covered and ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 8 relevant lines. 8 lines covered and ======= 9 relevant lines. 9 lines covered and >>>>>>> d0dc1f1 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509ee (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 75fa7e1 (Rebased) ======= ======= >>>>>>> d8dd3b4 (Featire specs) ======= >>>>>>> 365d41e (Featire specs) ======= >>>>>>> c05ee51 (Featire specs) ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> 13fca83 (Rebased) 9 relevant lines. 9 lines covered and ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) 8 relevant lines. 8 lines covered and ======= 9 relevant lines. 9 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) >>>>>>> 13fca83 (Rebased) 0 lines missed.
    
  1. 1 class Book < ApplicationRecord
  2. 1 has_many :authors_books, dependent: :destroy
  3. 1 has_many :authors, through: :authors_books
  4. 1 has_many :books_categories, dependent: :destroy
  5. 1 has_many :categories, through: :books_categories
  6. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41e (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> 13fca83 (Rebased) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 1ca9c0e (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 1ca9c0e (Featire specs) has_many :reviews, dependent: :destroy ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= has_many :reviews, dependent: :destroy ======= <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) has_many :reviews, dependent: :destroy ======= validates :title, presence: true >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= validates :title, presence: true >>>>>>> 752f0c0 (Featire specs) ======= validates :title, presence: true >>>>>>> 4e81ea2 (Featire specs) ======= validates :title, presence: true >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= validates :title, presence: true >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509ee (Featire specs) ======= has_many :reviews, dependent: :destroy >>>>>>> 75fa7e1 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 365d41e (Featire specs) ======= >>>>>>> c05ee51 (Featire specs) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 1ca9c0e (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= validates :title, presence: true >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= validates :title, presence: true >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= validates :title, presence: true <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= validates :title, presence: true >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= validates :title, presence: true >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= has_many :reviews, dependent: :destroy >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= validates :title, presence: true >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs)
  7. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8480924 (Featire specs) ======= >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41e (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> 13fca83 (Rebased) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 1ca9c0e (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 1ca9c0e (Featire specs)
  8. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8480924 (Featire specs)
  9. =======
  10. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  11. 1 >>>>>>> 752f0c0 (Featire specs) =======
  12. 1 >>>>>>> 4e81ea2 (Featire specs) =======
  13. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= =======
  14. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509ee (Featire specs) =======
  15. >>>>>>> 75fa7e1 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 365d41e (Featire specs) ======= >>>>>>> c05ee51 (Featire specs) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 1ca9c0e (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) =======
  16. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 77d62af (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= =======
  17. 1 >>>>>>> 4e81ea2 (Featire specs) =======
  18. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= =======
  19. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= =======
  20. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41e (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> 13fca83 (Rebased) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 1ca9c0e (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 1ca9c0e (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= validates :description, presence: true >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= validates :description, presence: true >>>>>>> 752f0c0 (Featire specs) ======= validates :description, presence: true >>>>>>> 4e81ea2 (Featire specs) ======= validates :description, presence: true >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= validates :description, presence: true >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509ee (Featire specs) ======= >>>>>>> 75fa7e1 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 365d41e (Featire specs) ======= >>>>>>> c05ee51 (Featire specs) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 1ca9c0e (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= validates :description, presence: true >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= validates :description, presence: true >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= validates :description, presence: true <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= validates :description, presence: true >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= validates :description, presence: true >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= validates :description, presence: true >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs)
  21. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD validates :title, :description, :year_of_publication, :materials, :dimensions, presence: true ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD validates :title, :description, :year_of_publication, :materials, :dimensions, presence: true ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> d0dc1f1 (Featire specs) ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 752f0c0 (Featire specs) ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 4e81ea2 (Featire specs) ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> 8480924 (Featire specs) has_many_attached :images >>>>>>> 75fa7e1 (Rebased) ======= ======= >>>>>>> 365d41e (Featire specs) ======= >>>>>>> c05ee51 (Featire specs) ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> 13fca83 (Rebased) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 1ca9c0e (Featire specs) has_many_attached :images ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) validates :title, :description, :year_of_publication, :materials, :dimensions, presence: true ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= validates :year_of_publication, :materials, :dimensions, presence: true <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= has_many_attached :images >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= ======= >>>>>>> af057e3 (Featire specs) has_many_attached :images ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs)
  22. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  23. 1 <<<<<<< HEAD validates :price_cents, :quantity, presence: true, ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD validates :price_cents, :quantity, presence: true, ======= validates :price, :quantity, presence: true, >>>>>>> d0dc1f1 (Featire specs) ======= validates :price, :quantity, presence: true, >>>>>>> 752f0c0 (Featire specs) ======= validates :price, :quantity, presence: true, >>>>>>> 4e81ea2 (Featire specs) ======= validates :price, :quantity, presence: true, >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= validates :price, :quantity, presence: true, >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509ee (Featire specs)
  24. <<<<<<< HEAD numericality: ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD numericality: ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> d0dc1f1 (Featire specs) ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> 752f0c0 (Featire specs) ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> 4e81ea2 (Featire specs) ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509ee (Featire specs)
  25. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= >>>>>>> 34509ee (Featire specs) { greater_than_or_equal_to: Constants::MIN_PRICE_IN_CENTS,
  26. less_than_or_equal_to: Constants::MAX_PRICE_IN_CENTS }
  27. <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509ee (Featire specs) end

app/models/books_category.rb

100.0% lines covered

4 relevant lines. 4 lines covered and 0 lines missed.
    
  1. 1 class BooksCategory < ApplicationRecord
  2. 1 belongs_to :category
  3. 1 belongs_to :book
  4. ======= ======= >>>>>>> 13fca83 (Rebased) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 1ca9c0e (Featire specs)
  5. >>>>>>> 75fa7e1 (Rebased)
  6. ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD
  7. >>>>>>> 311e9fa (Rebased) 1 validates :title, :description, :year_of_publication, :materials, :dimensions, presence: true ======= <<<<<<< HEAD validates :title, :description, :year_of_publication, :materials, :dimensions, presence: true ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs)
  8. <<<<<<< HEAD
  9. =======
  10. >>>>>>> 824bb2b (Featire specs) 1 <<<<<<< HEAD validates :price_cents, :quantity, presence: true, ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) validates :price_cents, :quantity, presence: true, ======= validates :price, :quantity, presence: true, >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= validates :price, :quantity, presence: true, >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= ======= validates :price, :quantity, presence: true, <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= validates :price, :quantity, presence: true, >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= validates :price, :quantity, presence: true, >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs)
  11. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) numericality: ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs)
  12. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) { greater_than_or_equal_to: Constants::MIN_PRICE_IN_CENTS, >>>>>>> 824bb2b (Featire specs)
  13. <<<<<<< HEAD numericality: ======= less_than_or_equal_to: Constants::MAX_PRICE_IN_CENTS } >>>>>>> 824bb2b (Featire specs)
  14. <<<<<<< HEAD { greater_than_or_equal_to: Constants::MIN_PRICE_IN_CENTS,
  15. less_than_or_equal_to: Constants::MAX_PRICE_IN_CENTS }
  16. ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) end

app/models/books_category.rb

100.0% lines covered

4 relevant lines. 4 lines covered and 0 lines missed.
    
  1. 1 class BooksCategory < ApplicationRecord
  2. 1 belongs_to :category
  3. 1 belongs_to :book
  4. 1 validates :category, :book, presence: true
  5. ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) end

app/models/books_category.rb

100.0% lines covered

4 relevant lines. 4 lines covered and 0 lines missed.
    
  1. 1 class BooksCategory < ApplicationRecord
  2. 1 belongs_to :category
  3. 1 belongs_to :book
  4. ======= ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  5. >>>>>>> 49e8a6c (Rebased)
  6. =======
  7. >>>>>>> d0dc1f1 (Featire specs) =======
  8. >>>>>>> 752f0c0 (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD validates :title, :description, :year_of_publication, :materials, :dimensions, presence: true ======= validates :price, :quantity, presence: true, >>>>>>> d0dc1f1 (Featire specs) ======= validates :price, :quantity, presence: true, >>>>>>> 752f0c0 (Featire specs)
  9. <<<<<<< HEAD <<<<<<< HEAD
  10. 1 =======
  11. >>>>>>> d0dc1f1 (Featire specs) =======
  12. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD validates :price_cents, :quantity, presence: true, ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> d0dc1f1 (Featire specs) ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> 752f0c0 (Featire specs)
  13. <<<<<<< HEAD <<<<<<< HEAD
  14. numericality:
  15. { greater_than_or_equal_to: Constants::MIN_PRICE_IN_CENTS,
  16. less_than_or_equal_to: Constants::MAX_PRICE_IN_CENTS }
  17. =======
  18. >>>>>>> d0dc1f1 (Featire specs) =======
  19. >>>>>>> 752f0c0 (Featire specs) end

app/models/books_category.rb

100.0% lines covered

4 relevant lines. 4 lines covered and 0 lines missed.
    
  1. 1 class BooksCategory < ApplicationRecord
  2. 1 belongs_to :category
  3. 1 belongs_to :book
  4. 1 validates :category, :book, presence: true
  5. end

app/models/category.rb

100.0% lines covered

4 relevant lines. 4 lines covered and 0 lines missed.
    
  1. 1 class Category < ApplicationRecord
  2. 1 has_many :books_categories, dependent: :destroy
  3. 1 has_many :books, through: :books_categories
  4. 1 validates :name, presence: true
  5. end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= >>>>>>> 6066f92 (Add login registration pages) ======= >>>>>>> 6e923b9 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3 (Add login registration pages) ======= >>>>>>> 34509ee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e989024 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= <<<<<<< HEAD ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> 78717cc (Manifest_cache true) ======= >>>>>>> 98beee2 (Manifest_cache true) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 385b8df (Manifest_cache true) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> 7bc7f9f (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= >>>>>>> 156ffe6 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 6066f92 (Add login registration pages) ======= >>>>>>> adc21e0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= >>>>>>> 84d0df6 (Manifest_cache true) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 793a6ed (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 8249ff3 (Add login registration pages) ======= >>>>>>> 4d90e3d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= >>>>>>> 450f4e3 (Manifest_cache true) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= >>>>>>> c5efe8e (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> e989024 (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= >>>>>>> 160fb15 (Fix) ======= <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) =======
<<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 4f4ea3f (Featire specs) =======
======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6d (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2179316 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0e (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> d245196 (Manifest_cache true)
>>>>>>> c033601 (Rebased) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= >>>>>>> 29e1af9 (Add login registration pages) ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024 (Add login registration pages) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 29e1af9 (Add login registration pages)
=======
=======
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages)

app/models/user.rb

100.0% <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs)

app/queries/book_query.rb

85.71% <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) lines covered

2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 class User < ApplicationRecord
  2. # Include default devise modules. Others available are:
  3. # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
  4. 1 devise :database_authenticatable, :registerable,
  5. :recoverable, :rememberable, :validatable,
  6. :confirmable, :lockable, :timeoutable, :trackable,
  7. :omniauthable
  8. end
<<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages)
>>>>>>> e1f4d17 (Add login registration pages)

app/models/user.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 class User < ApplicationRecord
  2. # Include default devise modules. Others available are:
  3. # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
  4. 1 devise :database_authenticatable, :registerable,
  5. :recoverable, :rememberable, :validatable,
  6. :confirmable, :lockable, :timeoutable, :trackable,
  7. :omniauthable
  8. end
>>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) =======
>>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix)

app/models/user.rb

100.0% <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 557c1b8 (Fix) ======= <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======

app/models/user.rb

100.0% ======= >>>>>>> a5d032d (Fix) lines covered

<<<<<<< HEAD 2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 class User < ApplicationRecord
  2. # Include default devise modules. Others available are:
  3. # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
  4. 1 devise :database_authenticatable, :registerable,
  5. :recoverable, :rememberable, :validatable,
  6. :confirmable, :lockable, :timeoutable, :trackable,
  7. :omniauthable
  8. end
>>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> b28889f (Fix) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price)

app/queries/book_query.rb

<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) 85.71% <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= 87.5% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 85.71% >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= ======= 87.5% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) lines covered

<<<<<<< HEAD 2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 class User < ApplicationRecord
  2. # Include default devise modules. Others available are:
  3. # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
  4. 1 devise :database_authenticatable, :registerable,
  5. :recoverable, :rememberable, :validatable,
  6. :confirmable, :lockable, :timeoutable, :trackable,
  7. :omniauthable
  8. end
>>>>>>> e1f4d17 (Add login registration pages)

app/models/user.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 class User < ApplicationRecord
  2. # Include default devise modules. Others available are:
  3. # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
  4. 1 devise :database_authenticatable, :registerable,
  5. :recoverable, :rememberable, :validatable,
  6. :confirmable, :lockable, :timeoutable, :trackable,
  7. :omniauthable
  8. end
>>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) =======
>>>>>>> a5d032d (Fix) =======
>>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs)

app/models/review.rb

100.0% <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) =======

app/models/user.rb

100.0% ======= >>>>>>> a5d032d (Fix) lines covered

<<<<<<< HEAD 2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 class User < ApplicationRecord
  2. # Include default devise modules. Others available are:
  3. # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
  4. 1 devise :database_authenticatable, :registerable,
  5. :recoverable, :rememberable, :validatable,
  6. :confirmable, :lockable, :timeoutable, :trackable,
  7. :omniauthable
  8. end
>>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs)

app/queries/book_query.rb

<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8480924 (Featire specs) 85.71% <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= 87.5% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 85.71% >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= 87.5% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= 85.71% >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) lines covered

<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8480924 (Featire specs) ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) 7 relevant lines. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= 7 relevant lines. >>>>>>> a5d032d (Fix) <<<<<<< HEAD ======= 7 relevant lines. <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= 7 relevant lines. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= ======= >>>>>>> af057e3 (Featire specs) ======= 7 relevant lines. >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) 7 lines covered and 0 lines missed.
    
  1. 1 class Review < ApplicationRecord
  2. 1 belongs_to :user
  3. 1 belongs_to :book
  4. 1 validates :title, presence: true, length: { maximum: Constants::VALIDATES_TITLE_LENGTH_MAX },
  5. format: { with: %r{\A[A-Za-z0-9!#$%&'*+-/=?^_`{|}~. ]+\z}, message: I18n.t('review.errors.title') }
  6. 1 validates :body, presence: true, length: { maximum: Constants::VALIDATES_TEXT_LENGTH_MAX },
  7. format: { with: %r{\A[A-Za-z0-9!#$%&'*+-/=?^_`{|}~. ]+\z}, message: I18n.t('review.errors.body') }
  8. 1 validates :verified, inclusion: { in: [true, false] }, presence: true
  9. 1 validates :rating,
  10. numericality: {
  11. greater_than_or_equal_to: Constants::STAR_MIN,
  12. less_than_or_equal_to: Constants::STAR_MAX
  13. }, presence: true
  14. end

app/models/shipping.rb

100.0% lines covered

1 relevant lines. 1 lines covered and 0 lines missed.
    
  1. 1 class Shipping < Address
  2. end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix)

app/models/user.rb

50.0% lines covered

12 relevant lines. 6 lines covered and 6 lines missed.
    
  1. 1 class User < ApplicationRecord
  2. 1 devise :database_authenticatable, :registerable,
  3. :recoverable, :rememberable, :validatable,
  4. :confirmable, :lockable, :timeoutable, :trackable,
  5. :omniauthable, omniauth_providers: [:facebook]
  6. 1 has_one :billing, dependent: :destroy
  7. 1 has_one :shipping, dependent: :destroy
  8. 1 has_many :reviews, dependent: :destroy
  9. 1 def self.from_omniauth(auth)
  10. where(provider: auth.provider, uid: auth.uid).first_or_create do |user|
  11. user.provider = auth.provider
  12. user.uid = auth.uid
  13. user.name = auth.info.name
  14. user.email = auth.info.email
  15. user.password = Devise.friendly_token[0, 20]
  16. end
  17. end
  18. end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 557c1b8 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 490b01d (Manifest_cache true)

app/models/user.rb

<<<<<<< HEAD <<<<<<< HEAD =======

app/models/review.rb

>>>>>>> aca90e3 (Rebased) ======= >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs)

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 2 relevant lines. 2 lines covered and ======= 7 relevant lines. 7 lines covered and >>>>>>> aca90e3 (Rebased) 0 lines missed.
    
  1. 1 <<<<<<< HEAD ======= class Review < ApplicationRecord
  2. 1 belongs_to :user
  3. 1 belongs_to :book
  4. 1 validates :title, presence: true, length: { maximum: Constants::VALIDATES_TITLE_LENGTH_MAX },
  5. format: { with: %r{\A[A-Za-z0-9!#$%&'*+-/=?^_`{|}~. ]+\z}, message: I18n.t('review.errors.title') }
  6. 1 validates :body, presence: true, length: { maximum: Constants::VALIDATES_TEXT_LENGTH_MAX },
  7. format: { with: %r{\A[A-Za-z0-9!#$%&'*+-/=?^_`{|}~. ]+\z}, message: I18n.t('review.errors.body') }
  8. 1 validates :verified, inclusion: { in: [true, false] }, presence: true
  9. 1 validates :rating,
  10. numericality: {
  11. greater_than_or_equal_to: Constants::STAR_MIN,
  12. less_than_or_equal_to: Constants::STAR_MAX
  13. }, presence: true
  14. end

app/models/shipping.rb

100.0% lines covered

1 relevant lines. 1 lines covered and 0 lines missed.
    
  1. 1 class Shipping < Address
  2. end

app/models/user.rb

50.0% lines covered

12 relevant lines. 6 lines covered and 6 lines missed.
    
  1. 1 >>>>>>> aca90e3 (Rebased) class User < ApplicationRecord
  2. <<<<<<< HEAD
  3. # Include default devise modules. Others available are:
  4. # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
  5. =======
  6. >>>>>>> aca90e3 (Rebased) 1 devise :database_authenticatable, :registerable,
  7. <<<<<<< HEAD
  8. =======
  9. >>>>>>> aca90e3 (Rebased) :recoverable, :rememberable, :validatable,
  10. <<<<<<< HEAD
  11. =======
  12. >>>>>>> aca90e3 (Rebased) :confirmable, :lockable, :timeoutable, :trackable,
  13. <<<<<<< HEAD
  14. =======
  15. >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD :omniauthable ======= :omniauthable, omniauth_providers: [:facebook] >>>>>>> aca90e3 (Rebased)
  16. <<<<<<< HEAD
  17. =======
  18. 1 has_one :billing, dependent: :destroy
  19. 1 has_one :shipping, dependent: :destroy
  20. 1 has_many :reviews, dependent: :destroy
  21. 1 def self.from_omniauth(auth)
  22. where(provider: auth.provider, uid: auth.uid).first_or_create do |user|
  23. user.provider = auth.provider
  24. user.uid = auth.uid
  25. user.name = auth.info.name
  26. user.email = auth.info.email
  27. user.password = Devise.friendly_token[0, 20]
  28. end
  29. end
  30. >>>>>>> aca90e3 (Rebased) end
<<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> aca90e3 (Rebased)

app/queries/book_query.rb

90.0% lines covered

10 relevant lines. 9 lines covered and ======= ======= >>>>>>> 824bb2b (Featire specs) 2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 class User < ApplicationRecord
  2. # Include default devise modules. Others available are:
  3. # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
  4. 1 devise :database_authenticatable, :registerable,
  5. :recoverable, :rememberable, :validatable,
  6. :confirmable, :lockable, :timeoutable, :trackable,
  7. :omniauthable
  8. end
>>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD =======
>>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> ae884b4 (Fix) ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= =======
>>>>>>> a5d032d (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) >>>>>>> ae884b4 (Fix)

app/queries/book_query.rb

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) 87.5% >>>>>>> 8480924 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) 87.5% ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) 87.5% ======= 85.71% >>>>>>> 752f0c0 (Featire specs) ======= 85.71% >>>>>>> 4e81ea2 (Featire specs) ======= 85.71% >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= ======= 87.5% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= 90.0% >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= 90.0% >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> ae884b4 (Fix) ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= 90.0% >>>>>>> a5d032d (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) >>>>>>> ae884b4 (Fix) lines covered

<<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 4f4ea3f (Featire specs) ======= >>>>>>> ae884b4 (Fix) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) >>>>>>> ae884b4 (Fix) 8 relevant lines. 7 lines covered and ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) >>>>>>> 4f4ea3f (Featire specs) 8 relevant lines. 7 lines covered and ======= 7 relevant lines. 6 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 7 relevant lines. 6 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 9440753 (Featire specs) 7 relevant lines. 6 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= >>>>>>> 4f4ea3f (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= ======= 8 relevant lines. 7 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= 8 relevant lines. 7 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 824bb2b (Featire specs) ======= 10 relevant lines. 9 lines covered and <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= ======= 6 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= 6 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= ======= 6 lines covered and >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= 6 lines covered and >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= >>>>>>> fc3774f (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> c8da2e3 (Fix) ======= ======= 7 relevant lines. 6 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= ======= 8 relevant lines. 7 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= 10 relevant lines. 9 lines covered and >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= ======= ======= 6 lines covered and >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= ======= 6 lines covered and >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs) 1 lines missed.
    
  1. 1 class BookQuery
  2. 1 <<<<<<< HEAD <<<<<<< HEAD SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab529 (Fix) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> 4f4ea3f (Featire specs) SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', >>>>>>> c033601 (Rebased) >>>>>>> 9a49b7b (Rebased) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', >>>>>>> a5d032d (Fix) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) >>>>>>> ae884b4 (Fix)
  3. <<<<<<< HEAD 'title DESC'].freeze ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 'title DESC'].freeze ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) 'title DESC'].freeze ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 'title DESC'].freeze ======= >>>>>>> c8da2e3 (Fix) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= >>>>>>> ae884b4 (Fix) ======= 'title DESC'].freeze >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= 'title DESC'].freeze >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= 'title DESC'].freeze >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 'title DESC'].freeze >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) >>>>>>> ae884b4 (Fix)
  4. 1 <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774f (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 4f4ea3f (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> a636fda (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= >>>>>>> ae884b4 (Fix) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> 5a2009f (Fix) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs) def self.query(params)
  5. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f92 (Add login registration pages) ======= >>>>>>> 6e923b9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8249ff3 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e989024 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs)
  6. =======
  7. >>>>>>> 752f0c0 (Featire specs) =======
  8. >>>>>>> 4e81ea2 (Featire specs) 24 =======
  9. 25 >>>>>>> 1214e1f (Add login registration pages) =======
  10. 24 >>>>>>> 08edf50 (Featire specs) =======
  11. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  12. 30 >>>>>>> aca90e3 (Rebased) ======= ======= <<<<<<< HEAD ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) ======= >>>>>>> adc21e0 (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> 793a6ed (Add login registration pages) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> c5efe8e (Add login registration pages) ======= >>>>>>> 160fb15 (Fix) ======= >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs)
  13. 30 >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 8249ff3 (Add login registration pages) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> fc3774f (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f92 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> 4f4ea3f (Featire specs)
  14. 24 <<<<<<< HEAD ======= =======
  15. 25 >>>>>>> 1214e1f (Add login registration pages) =======
  16. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= >>>>>>> 4f4ea3f (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= ======= ======= ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs)
  17. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3 (Add login registration pages) ======= >>>>>>> 8480924 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 57a2e05 (Add login registration pages) =======
  18. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= =======
  19. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 824bb2b (Featire specs) =======
  20. 30 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs)
  21. 30 =======
  22. 30 >>>>>>> 9620751 (Featire specs) =======
  23. 24 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) =======
  24. 24 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= =======
  25. 24 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= =======
  26. 25 >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f92 (Add login registration pages) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= =======
  27. 24 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= >>>>>>> fc3774f (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) >>>>>>> c8da2e3 (Fix) ======= =======
  28. 24 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= =======
  29. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= =======
  30. 25 >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024 (Add login registration pages) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 31507b8 (Add login registration pages) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) =======
  31. 30 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af9 (Add login registration pages) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5a2009f (Fix) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) if SORT_METHODS.include?(params[:sort].to_s) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 4f4ea3f (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774f (Featire specs) if SORT_METHODS.include?(params[:sort].to_s) ======= if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 752f0c0 (Featire specs) ======= if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 4e81ea2 (Featire specs) ======= if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) if SORT_METHODS.include?(params[:sort].to_s) ======= if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> a636fda (Featire specs) ======= ======= if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= ======= if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= >>>>>>> ae884b4 (Fix) ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> 5a2009f (Fix) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= ======= if SORT_METHODS.include?(params[:sort].to_s) ======= if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= ======= if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs)
  32. <<<<<<< HEAD <<<<<<< HEAD
  33. 12 ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  34. 12 ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab529 (Fix) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs)
  35. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  36. =======
  37. >>>>>>> 752f0c0 (Featire specs) =======
  38. >>>>>>> 4e81ea2 (Featire specs) =======
  39. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) 7 <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs)
  40. 12 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  41. 12 =======
  42. 12 >>>>>>> 9620751 (Featire specs) =======
  43. 7 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) =======
  44. 7 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= =======
  45. 7 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= =======
  46. 7 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f (Fix) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= ======= ======= >>>>>>> df37394 (Featire specs)
  47. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  48. =======
  49. >>>>>>> 752f0c0 (Featire specs) =======
  50. >>>>>>> 4e81ea2 (Featire specs) =======
  51. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) 7 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= =======
  52. 7 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= =======
  53. 7 <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) =======
  54. 12 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
  55. 7 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs) if params[:category].nil?
  56. <<<<<<< HEAD <<<<<<< HEAD
  57. 12 ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  58. 12 ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab529 (Fix) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs)
  59. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  60. =======
  61. >>>>>>> 752f0c0 (Featire specs) =======
  62. >>>>>>> 4e81ea2 (Featire specs) =======
  63. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) 7 <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs)
  64. 12 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  65. 12 =======
  66. 12 >>>>>>> 9620751 (Featire specs) =======
  67. 7 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) =======
  68. 7 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= =======
  69. 7 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= =======
  70. 7 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f (Fix) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= ======= ======= >>>>>>> df37394 (Featire specs)
  71. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  72. =======
  73. >>>>>>> 752f0c0 (Featire specs) =======
  74. >>>>>>> 4e81ea2 (Featire specs) =======
  75. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) 7 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= =======
  76. 7 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= =======
  77. 7 <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) =======
  78. 12 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
  79. 7 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs) <<<<<<< HEAD Book.order(params[:sort]) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 77d62af (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) Book.order(params[:sort]) ======= Book.all.order(params[:sort]) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 932dbec (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= Book.all.order(params[:sort]) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= Book.all.order(params[:sort]) >>>>>>> 4e81ea2 (Featire specs) ======= Book.all.order(params[:sort]) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= Book.all.order(params[:sort]) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= Book.all.order(params[:sort]) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= Book.all.order(params[:sort]) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= Book.order(params[:sort]) >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> 5a2009f (Fix) ======= >>>>>>> ae884b4 (Fix) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= Book.all.order(params[:sort]) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= Book.all.order(params[:sort]) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= Book.all.order(params[:sort]) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= ======= Book.all.order(params[:sort]) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs)
  80. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5a2009f (Fix) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  81. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) >>>>>>> 4f4ea3f (Featire specs)
  82. =======
  83. >>>>>>> 752f0c0 (Featire specs) =======
  84. >>>>>>> 4e81ea2 (Featire specs) =======
  85. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= =======
  86. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
  87. >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs)
  88. =======
  89. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> a636fda (Featire specs) ======= =======
  90. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= =======
  91. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= =======
  92. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
  93. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= =======
  94. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= >>>>>>> ae884b4 (Fix) =======
  95. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> 5a2009f (Fix) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  96. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= =======
  97. =======
  98. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= =======
  99. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs) else
  100. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5a2009f (Fix) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  101. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) >>>>>>> 4f4ea3f (Featire specs)
  102. =======
  103. >>>>>>> 752f0c0 (Featire specs) =======
  104. >>>>>>> 4e81ea2 (Featire specs) =======
  105. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= =======
  106. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
  107. >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs)
  108. =======
  109. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> a636fda (Featire specs) ======= =======
  110. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= =======
  111. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= =======
  112. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
  113. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= =======
  114. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= >>>>>>> ae884b4 (Fix) =======
  115. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> 5a2009f (Fix) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  116. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= =======
  117. =======
  118. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= =======
  119. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs) <<<<<<< HEAD Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }).order(params[:sort]) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 77d62af (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }).order(params[:sort]) ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 932dbec (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 4e81ea2 (Featire specs) ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }).order(params[:sort]) >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> 5a2009f (Fix) ======= >>>>>>> ae884b4 (Fix) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs)
  120. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5a2009f (Fix) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  121. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) >>>>>>> 4f4ea3f (Featire specs)
  122. =======
  123. >>>>>>> 752f0c0 (Featire specs) =======
  124. >>>>>>> 4e81ea2 (Featire specs) =======
  125. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= =======
  126. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
  127. >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs)
  128. =======
  129. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> a636fda (Featire specs) ======= =======
  130. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= =======
  131. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= =======
  132. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
  133. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= =======
  134. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= >>>>>>> ae884b4 (Fix) =======
  135. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> 5a2009f (Fix) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  136. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= =======
  137. =======
  138. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= =======
  139. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs) end
  140. <<<<<<< HEAD <<<<<<< HEAD
  141. 18 ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  142. 18 ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab529 (Fix) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs)
  143. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) >>>>>>> 4f4ea3f (Featire specs)
  144. =======
  145. >>>>>>> 752f0c0 (Featire specs) =======
  146. >>>>>>> 4e81ea2 (Featire specs) =======
  147. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= =======
  148. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> 5a2009f (Fix) ======= >>>>>>> ae884b4 (Fix) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs)
  149. 18 elsif params[:category].nil?
  150. 16 Book.all
  151. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 932dbec (Featire specs) >>>>>>> c033601 (Rebased) ======= =======
  152. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> a636fda (Featire specs) ======= =======
  153. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= =======
  154. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= =======
  155. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= =======
  156. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
  157. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= =======
  158. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= >>>>>>> ae884b4 (Fix) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= ======= =======
  159. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= =======
  160. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs) >>>>>>> 9bfbd88 (Featire specs) elsif params[:category].nil?
  161. <<<<<<< HEAD <<<<<<< HEAD
  162. 16 ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  163. 16 ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) >>>>>>> 6066f92 (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs)
  164. 2 >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> 4f4ea3f (Featire specs)
  165. 17 <<<<<<< HEAD ======= =======
  166. 18 >>>>>>> 1214e1f (Add login registration pages) =======
  167. 17 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= =======
  168. 17 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= =======
  169. 18 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= =======
  170. 2 >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs)
  171. 2 =======
  172. 2 >>>>>>> 9620751 (Featire specs) =======
  173. 17 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) =======
  174. 17 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= =======
  175. 17 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= =======
  176. 18 >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f92 (Add login registration pages) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= =======
  177. 17 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= =======
  178. 17 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) ======= =======
  179. 17 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= =======
  180. 18 >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) =======
  181. 2 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af9 (Add login registration pages) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs) <<<<<<< HEAD Book.all ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD Book.all ======= Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }) >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 77d62af (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }) ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 932dbec (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }) >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs)
  182. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774f (Featire specs)
  183. ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  184. =======
  185. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  186. >>>>>>> 9c0d812 (Featire specs) =======
  187. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) =======
  188. >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) >>>>>>> 4f4ea3f (Featire specs)
  189. =======
  190. >>>>>>> 752f0c0 (Featire specs) =======
  191. >>>>>>> 4e81ea2 (Featire specs) =======
  192. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= =======
  193. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
  194. >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs)
  195. =======
  196. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> a636fda (Featire specs) ======= =======
  197. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
  198. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) else
  199. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages)
  200. 2 >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 8249ff3 (Add login registration pages) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs)
  201. =======
  202. >>>>>>> 752f0c0 (Featire specs) =======
  203. >>>>>>> 4e81ea2 (Featire specs) 17 =======
  204. 17 <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) =======
  205. 18 >>>>>>> 1214e1f (Add login registration pages) =======
  206. 17 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 8480924 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) =======
  207. 17 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) =======
  208. 18 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> bc757df (Fix book_spec decrease quantity and price) >>>>>>> 8249ff3 (Add login registration pages) =======
  209. 2 <<<<<<< HEAD >>>>>>> aca90e3 (Rebased) ======= >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= =======
  210. 18 >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) =======
  211. 2 >>>>>>> c033601 (Rebased) ======= >>>>>>> 824bb2b (Featire specs)
  212. 2 =======
  213. 17 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= =======
  214. 17 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= =======
  215. 17 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= =======
  216. 18 >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= =======
  217. 17 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3 (Add login registration pages) ======= ======= ======= =======
  218. 17 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= ======= =======
  219. 17 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  220. 18 >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024 (Add login registration pages) ======= ======= =======
  221. 2 >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) <<<<<<< HEAD Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 67ab529 (Fix) ======= >>>>>>> 8480924 (Featire specs) Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }) ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> d0dc1f1 (Featire specs) ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 752f0c0 (Featire specs) ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 4e81ea2 (Featire specs) ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 08edf50 (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD ======= ======= ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= ======= Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }) >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs)
  222. <<<<<<< HEAD <<<<<<< HEAD
  223. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  224. =======
  225. ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD
  226. ======= <<<<<<< HEAD
  227. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  228. >>>>>>> 9c0d812 (Featire specs) =======
  229. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  230. >>>>>>> 34509ee (Featire specs) >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  231. =======
  232. >>>>>>> 752f0c0 (Featire specs) =======
  233. >>>>>>> 4e81ea2 (Featire specs) =======
  234. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= =======
  235. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
  236. >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs)
  237. =======
  238. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= =======
  239. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= =======
  240. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= >>>>>>> fc3774f (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= =======
  241. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= =======
  242. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= =======
  243. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= =======
  244. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) =======
  245. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  246. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= =======
  247. =======
  248. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= =======
  249. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs) end
  250. <<<<<<< HEAD <<<<<<< HEAD
  251. ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  252. ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab529 (Fix) <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs)
  253. =======
  254. <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  255. >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) =======
  256. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  257. >>>>>>> 34509ee (Featire specs) >>>>>>> 3723aad (Featire specs) ======= =======
  258. ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs)
  259. ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  260. =======
  261. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  262. >>>>>>> 9c0d812 (Featire specs) =======
  263. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) =======
  264. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) >>>>>>> 4f4ea3f (Featire specs)
  265. =======
  266. >>>>>>> 752f0c0 (Featire specs) =======
  267. >>>>>>> 4e81ea2 (Featire specs) =======
  268. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 4f4ea3f (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= =======
  269. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= =======
  270. >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
  271. >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs)
  272. =======
  273. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= =======
  274. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= =======
  275. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= =======
  276. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= =======
  277. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= =======
  278. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= =======
  279. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) =======
  280. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  281. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= =======
  282. =======
  283. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= =======
  284. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs) end
  285. <<<<<<< HEAD <<<<<<< HEAD
  286. ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  287. ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab529 (Fix) <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs)
  288. =======
  289. <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  290. >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) =======
  291. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  292. >>>>>>> 34509ee (Featire specs) >>>>>>> 3723aad (Featire specs) ======= =======
  293. ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs)
  294. ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  295. =======
  296. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  297. >>>>>>> 9c0d812 (Featire specs) =======
  298. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) =======
  299. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) >>>>>>> 4f4ea3f (Featire specs)
  300. =======
  301. >>>>>>> 752f0c0 (Featire specs) =======
  302. >>>>>>> 4e81ea2 (Featire specs) =======
  303. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 4f4ea3f (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= =======
  304. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= =======
  305. >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
  306. >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs)
  307. =======
  308. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= =======
  309. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= =======
  310. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= =======
  311. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= =======
  312. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= =======
  313. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= =======
  314. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) =======
  315. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  316. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= =======
  317. =======
  318. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= =======
  319. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs) end
<<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= >>>>>>> 8480924 (Featire specs) ======= >>>>>>> d8abfed (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 78717cc (Manifest_cache true) ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 98beee2 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6d (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2179316 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0e (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> d245196 (Manifest_cache true)

config/application.rb

100.0% lines covered

6 relevant lines. 6 lines covered and 0 lines missed.
    
  1. 1 require_relative 'boot'
  2. 1 require 'rails/all'
  3. # Require the gems listed in Gemfile, including any gems
  4. # you've limited to :test, :development, or :production.
  5. 1 Bundler.require(*Rails.groups)
  6. 1 module BookStore
  7. 1 class Application < Rails::Application
  8. # Initialize configuration defaults for originally generated Rails version.
  9. 1 config.load_defaults 6.1
  10. # Configuration for the application, engines, and railties goes here.
  11. #
  12. # These settings can be overridden in specific environments using the files
  13. # in config/environments, which are processed later.
  14. #
  15. # config.time_zone = "Central Time (US & Canada)"
  16. # config.eager_load_paths << Rails.root.join("extras")
  17. end
  18. end

config/boot.rb

100.0% lines covered

3 relevant lines. 3 lines covered and 0 lines missed.
    
  1. 1 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
  2. 1 require 'bundler/setup' # Set up gems listed in the Gemfile.
  3. 1 require 'bootsnap/setup' # Speed up boot time by caching expensive operations.

config/environment.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. # Load the Rails application.
  2. 1 require_relative 'application'
  3. # Initialize the Rails application.
  4. 1 Rails.application.initialize!

config/environments/test.rb

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8480924 (Featire specs) ======= >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41e (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> 13fca83 (Rebased) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 1ca9c0e (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 1ca9c0e (Featire specs) 19 relevant lines. 19 lines covered and ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8480924 (Featire specs) 19 relevant lines. 19 lines covered and ======= 18 relevant lines. 18 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= 18 relevant lines. 18 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 18 relevant lines. 18 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 18 relevant lines. 18 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= 18 relevant lines. 18 lines covered and >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509ee (Featire specs) ======= 19 relevant lines. 19 lines covered and >>>>>>> 75fa7e1 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 365d41e (Featire specs) ======= >>>>>>> c05ee51 (Featire specs) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 1ca9c0e (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= 18 relevant lines. 18 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 77d62af (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= 18 relevant lines. 18 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 18 relevant lines. 18 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= 18 relevant lines. 18 lines covered and >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= 19 relevant lines. 19 lines covered and >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs) 0 lines missed.
    
  1. 1 require 'active_support/core_ext/integer/time'
  2. # The test environment is used exclusively to run your application's
  3. # test suite. You never need to work with it otherwise. Remember that
  4. # your test database is "scratch space" for the test suite and is wiped
  5. # and recreated between test runs. Don't rely on the data there!
  6. 1 Rails.application.configure do
  7. # Settings specified here will take precedence over those in config/application.rb.
  8. 1 config.cache_classes = false
  9. 1 config.action_view.cache_template_loading = true
  10. # Do not eager load code on boot. This avoids loading your whole application
  11. # just for the purpose of running a single test. If you are using a tool that
  12. # preloads Rails for running tests, you may have to set it to true.
  13. 1 config.eager_load = false
  14. # Configure public file server for tests with Cache-Control for performance.
  15. 1 config.public_file_server.enabled = true
  16. 1 config.public_file_server.headers = {
  17. 'Cache-Control' => "public, max-age=#{1.hour.to_i}"
  18. }
  19. # Show full error reports and disable caching.
  20. 1 config.consider_all_requests_local = true
  21. 1 config.action_controller.perform_caching = false
  22. 1 config.cache_store = :null_store
  23. # Raise exceptions instead of rendering exception templates.
  24. 1 config.action_dispatch.show_exceptions = false
  25. # Disable request forgery protection in test environment.
  26. 1 config.action_controller.allow_forgery_protection = false
  27. # Store uploaded files on the local file system in a temporary directory.
  28. 1 config.active_storage.service = :test
  29. 1 config.action_mailer.perform_caching = false
  30. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8480924 (Featire specs) ======= >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41e (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> 13fca83 (Rebased) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 1ca9c0e (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 1ca9c0e (Featire specs)
  31. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8480924 (Featire specs)
  32. 1 =======
  33. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  34. >>>>>>> 752f0c0 (Featire specs) =======
  35. >>>>>>> 4e81ea2 (Featire specs) =======
  36. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= =======
  37. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509ee (Featire specs) =======
  38. 1 >>>>>>> 75fa7e1 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 365d41e (Featire specs) ======= >>>>>>> c05ee51 (Featire specs) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 1ca9c0e (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) =======
  39. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 77d62af (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= =======
  40. >>>>>>> 4e81ea2 (Featire specs) =======
  41. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= =======
  42. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= =======
  43. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41e (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> 13fca83 (Rebased) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 1ca9c0e (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 1ca9c0e (Featire specs) config.action_mailer.default_url_options = { host: 'localhost', port: 3000 } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= config.action_mailer.default_url_options = { host: 'localhost', port: 3000 } ======= <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) config.action_mailer.default_url_options = { host: 'localhost', port: 3000 } ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509ee (Featire specs) ======= config.action_mailer.default_url_options = { host: 'localhost', port: 3000 } >>>>>>> 75fa7e1 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 365d41e (Featire specs) ======= >>>>>>> c05ee51 (Featire specs) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 1ca9c0e (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= config.action_mailer.default_url_options = { host: 'localhost', port: 3000 } >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs)
  44. # Tell Action Mailer not to deliver emails to the real world.
  45. # The :test delivery method accumulates sent emails in the
  46. # ActionMailer::Base.deliveries array.
  47. 1 config.action_mailer.delivery_method = :test
  48. # Print deprecation notices to the stderr.
  49. 1 config.active_support.deprecation = :stderr
  50. # Raise exceptions for disallowed deprecations.
  51. 1 config.active_support.disallowed_deprecation = :raise
  52. # Tell Active Support which deprecation messages to disallow.
  53. 1 config.active_support.disallowed_deprecation_warnings = []
  54. # Raises error for missing translations.
  55. # config.i18n.raise_on_missing_translations = true
  56. # Annotate rendered view with file names.
  57. # config.action_view.annotate_rendered_view_with_filenames = true
  58. end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= >>>>>>> 34509ee (Featire specs) ======= >>>>>>> 75fa7e1 (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 365d41e (Featire specs) ======= >>>>>>> c05ee51 (Featire specs) ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> 13fca83 (Rebased) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 1ca9c0e (Featire specs) ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs)

config/initializers/active_admin.rb

100.0% lines covered

11 relevant lines. 11 lines covered and 0 lines missed.
    
  1. 1 ActiveAdmin.setup do |config|
  2. 1 config.site_title = 'Book Store'
  3. 1 config.authentication_method = :authenticate_admin_user!
  4. 1 config.current_user_method = :current_admin_user
  5. 1 config.logout_link_path = :destroy_admin_user_session_path
  6. 1 config.batch_actions = true
  7. 1 config.filter_attributes = %i[encrypted_password password password_confirmation]
  8. 1 config.localize_format = :long
  9. 1 config.default_per_page = 30
  10. 1 config.max_per_page = 10_000
  11. 1 config.use_webpacker = true
  12. end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509ee (Featire specs) ======= >>>>>>> 75fa7e1 (Rebased) ======= ======= >>>>>>> 13fca83 (Rebased) ======= >>>>>>> f136376 (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs)

config/initializers/application_controller_renderer.rb

100.0% lines covered

0 relevant lines. 0 lines covered and 0 lines missed.
    
  1. # Be sure to restart your server when you modify this file.
  2. # ActiveSupport::Reloader.to_prepare do
  3. # ApplicationController.renderer.defaults.merge!(
  4. # http_host: 'example.org',
  5. # https: false
  6. # )
  7. # end

config/initializers/assets.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. # Be sure to restart your server when you modify this file.
  2. # Version of your assets, change this if you want to expire all your assets.
  3. 1 Rails.application.config.assets.version = '1.0'
  4. # Add additional assets to the asset load path.
  5. # Rails.application.config.assets.paths << Emoji.images_path
  6. # Add Yarn node_modules folder to the asset load path.
  7. 1 Rails.application.config.assets.paths << Rails.root.join('node_modules')
  8. # Precompile additional assets.
  9. # application.js, application.css, and all non-JS/CSS in the app/assets
  10. # folder are already added.
  11. # Rails.application.config.assets.precompile += %w( admin.js admin.css )

config/initializers/backtrace_silencers.rb

100.0% lines covered

1 relevant lines. 1 lines covered and 0 lines missed.
    
  1. # Be sure to restart your server when you modify this file.
  2. # You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces.
  3. # Rails.backtrace_cleaner.add_silencer { |line| /my_noisy_library/.match?(line) }
  4. # You can also remove all the silencers if you're trying to debug a problem that might stem from framework code
  5. # by setting BACKTRACE=1 before calling your invocation, like "BACKTRACE=1 ./bin/rails runner 'MyClass.perform'".
  6. 1 Rails.backtrace_cleaner.remove_silencers! if ENV['BACKTRACE']

config/initializers/content_security_policy.rb

100.0% lines covered

0 relevant lines. 0 lines covered and 0 lines missed.
    
  1. # Be sure to restart your server when you modify this file.
  2. # Define an application-wide content security policy
  3. # For further information see the following documentation
  4. # https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy
  5. # Rails.application.config.content_security_policy do |policy|
  6. # policy.default_src :self, :https
  7. # policy.font_src :self, :https, :data
  8. # policy.img_src :self, :https, :data
  9. # policy.object_src :none
  10. # policy.script_src :self, :https
  11. # policy.style_src :self, :https
  12. # # If you are using webpack-dev-server then specify webpack-dev-server host
  13. # policy.connect_src :self, :https, "http://localhost:3035", "ws://localhost:3035" if Rails.env.development?
  14. # # Specify URI for violation reports
  15. # # policy.report_uri "/csp-violation-report-endpoint"
  16. # end
  17. # If you are using UJS then enable automatic nonce generation
  18. # Rails.application.config.content_security_policy_nonce_generator = -> request { SecureRandom.base64(16) }
  19. # Set the nonce only to specific directives
  20. # Rails.application.config.content_security_policy_nonce_directives = %w(script-src)
  21. # Report CSP violations to a specified URI
  22. # For further information see the following documentation:
  23. # https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy-Report-Only
  24. # Rails.application.config.content_security_policy_report_only = true

config/initializers/cookies_serializer.rb

100.0% lines covered

1 relevant lines. 1 lines covered and 0 lines missed.
    
  1. # Be sure to restart your server when you modify this file.
  2. # Specify a serializer for the signed and encrypted cookie jars.
  3. # Valid options are :json, :marshal, and :hybrid.
  4. 1 Rails.application.config.action_dispatch.cookies_serializer = :json
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f92 (Add login registration pages) ======= >>>>>>> 6e923b9 (Featire specs) ======= >>>>>>> 8249ff3 (Add login registration pages) ======= >>>>>>> 34509ee (Featire specs) ======= >>>>>>> e989024 (Add login registration pages) ======= >>>>>>> 75fa7e1 (Rebased) ======= >>>>>>> 8480924 (Featire specs) ======= >>>>>>> d8dd3b4 (Featire specs) ======= >>>>>>> 4f4ea3f (Featire specs) ======= >>>>>>> 365d41e (Featire specs) ======= >>>>>>> c05ee51 (Featire specs) ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> 29e1af9 (Add login registration pages) ======= >>>>>>> 13fca83 (Rebased) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 1ca9c0e (Featire specs) ======= >>>>>>> aca90e3 (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) ======= >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> 793a6ed (Add login registration pages) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> c5efe8e (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f92 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3 (Add login registration pages) ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024 (Add login registration pages) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= ======= ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af9 (Add login registration pages) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs)

config/initializers/devise.rb

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f92 (Add login registration pages) ======= ======= >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3 (Add login registration pages) ======= ======= >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024 (Add login registration pages) ======= ======= >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= >>>>>>> 311e9fa (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages) >>>>>>> 29e1af9 (Add login registration pages) 14 relevant lines. 14 lines covered and ======= 13 relevant lines. 13 lines covered and <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= 14 relevant lines. 14 lines covered and >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f92 (Add login registration pages) ======= ======= ======= 13 relevant lines. 13 lines covered and >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3 (Add login registration pages) ======= ======= ======= 13 relevant lines. 13 lines covered and >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024 (Add login registration pages) ======= ======= 14 relevant lines. 14 lines covered and >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= ======= 14 relevant lines. 14 lines covered and >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= 13 relevant lines. 13 lines covered and >>>>>>> 730a8ca (Add login registration pages) ======= 13 relevant lines. 13 lines covered and >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af9 (Add login registration pages) ======= ======= ======= 14 relevant lines. 14 lines covered and >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) >>>>>>> 13fca83 (Rebased) 0 lines missed.
    
  1. # frozen_string_literal: true
  2. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f92 (Add login registration pages) ======= ======= >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3 (Add login registration pages) ======= ======= >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024 (Add login registration pages) ======= ======= >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= >>>>>>> 311e9fa (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages) >>>>>>> 29e1af9 (Add login registration pages)
  3. 1 =======
  4. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
  5. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) ======= =======
  6. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> c5efe8e (Add login registration pages) =======
  7. 1 >>>>>>> aa3618b (Rebased) =======
  8. 1 >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
  9. >>>>>>> 730a8ca (Add login registration pages) =======
  10. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) ======= =======
  11. 1 >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD Devise.setup do |config| <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= # Assuming you have not yet modified this file, each configuration option below <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= # Assuming you have not yet modified this file, each configuration option below >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) ======= ======= # Assuming you have not yet modified this file, each configuration option below >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> c5efe8e (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= # Assuming you have not yet modified this file, each configuration option below >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD Devise.setup do |config| ======= # Assuming you have not yet modified this file, each configuration option below >>>>>>> 1214e1f (Add login registration pages) ======= # Assuming you have not yet modified this file, each configuration option below >>>>>>> 730a8ca (Add login registration pages) ======= # Assuming you have not yet modified this file, each configuration option below >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) ======= ======= Devise.setup do |config| >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased)
  12. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages)
  13. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  14. >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com' ======= # is set to its default value. Note that some are commented out while others >>>>>>> 9bfbd88 (Featire specs)
  15. <<<<<<< HEAD
  16. 1 =======
  17. >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD require 'devise/orm/active_record' ======= # are not: uncommented lines are intended to protect your configuration from >>>>>>> 9bfbd88 (Featire specs)
  18. <<<<<<< HEAD
  19. 1 =======
  20. >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD config.case_insensitive_keys = [:email] ======= # breaking changes in upgrades (i.e., in the event that future versions of >>>>>>> 9bfbd88 (Featire specs)
  21. <<<<<<< HEAD
  22. 1 =======
  23. >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD config.strip_whitespace_keys = [:email] ======= # Devise change the default values for those options). >>>>>>> 9bfbd88 (Featire specs)
  24. <<<<<<< HEAD
  25. 1 =======
  26. >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD config.skip_session_storage = [:http_auth] ======= # >>>>>>> 9bfbd88 (Featire specs)
  27. <<<<<<< HEAD
  28. 1 =======
  29. >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD config.stretches = Rails.env.test? ? 1 : 12 ======= # Use this hook to configure devise mailer, warden hooks and so forth. >>>>>>> 9bfbd88 (Featire specs)
  30. <<<<<<< HEAD
  31. 1 =======
  32. >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD config.reconfirmable = true ======= # Many of these configuration options can be set straight in your model. >>>>>>> 9bfbd88 (Featire specs)
  33. 1 ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD config.expire_all_remember_me_on_sign_out = true ======= Devise.setup do |config| >>>>>>> 9bfbd88 (Featire specs) ======= Devise.setup do |config| ======= # Assuming you have not yet modified this file, each configuration option below >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 156ffe6 (Add login registration pages)
  34. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f92 (Add login registration pages)
  35. 1 =======
  36. >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD config.password_length = 6..128 ======= # The secret key used by Devise. Devise uses this key to generate >>>>>>> 9bfbd88 (Featire specs)
  37. <<<<<<< HEAD
  38. 1 =======
  39. >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD config.email_regexp = /\A[^@\s]+@[^@\s]+\z/ ======= # random tokens. Changing this key will render invalid all existing >>>>>>> 9bfbd88 (Featire specs)
  40. <<<<<<< HEAD
  41. 1 =======
  42. >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD config.reset_password_within = 6.hours ======= # confirmation, reset password and unlock tokens in the database. >>>>>>> 9bfbd88 (Featire specs)
  43. <<<<<<< HEAD
  44. 1 =======
  45. >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD config.sign_out_via = :delete ======= # Devise will use the `secret_key_base` as its `secret_key` >>>>>>> 9bfbd88 (Featire specs)
  46. <<<<<<< HEAD
  47. 1 =======
  48. >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD config.omniauth :facebook, ======= # by default. You can change it below and use your own secret key. >>>>>>> 9bfbd88 (Featire specs)
  49. <<<<<<< HEAD Rails.application.credentials.dig(:facebook, :FACEBOOK_ID), ======= # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24' >>>>>>> 9bfbd88 (Featire specs)
  50. <<<<<<< HEAD Rails.application.credentials.dig(:facebook, :FACEBOOK_SECRET), ======= >>>>>>> 9bfbd88 (Featire specs)
  51. <<<<<<< HEAD scope: 'email', info_fields: 'email,name' ======= # ==> Controller configuration >>>>>>> 9bfbd88 (Featire specs)
  52. <<<<<<< HEAD ======= # Configure the parent class to the devise controllers.
  53. # config.parent_controller = 'DeviseController'
  54. # ==> Mailer Configuration
  55. # Configure the e-mail address which will be shown in Devise::Mailer,
  56. # note that it will be overwritten if you use your own mailer class
  57. # with default "from" parameter.
  58. <<<<<<< HEAD ======= ======= ======= >>>>>>> 156ffe6 (Add login registration pages)
  59. >>>>>>> 9a49b7b (Rebased) >>>>>>> 6066f92 (Add login registration pages) 1 =======
  60. >>>>>>> 1214e1f (Add login registration pages) =======
  61. >>>>>>> 730a8ca (Add login registration pages) =======
  62. >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= =======
  63. <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 1214e1f (Add login registration pages) =======
  64. >>>>>>> 730a8ca (Add login registration pages) =======
  65. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) ======= =======
  66. 1 >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com' ======= # is set to its default value. Note that some are commented out while others >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com' ======= # is set to its default value. Note that some are commented out while others >>>>>>> 1214e1f (Add login registration pages) ======= # is set to its default value. Note that some are commented out while others >>>>>>> 730a8ca (Add login registration pages) ======= # is set to its default value. Note that some are commented out while others >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) ======= config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com' >>>>>>> 49e8a6c (Rebased)
  67. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  68. # Configure the class responsible to send e-mails.
  69. # config.mailer = 'Devise::Mailer'
  70. # Configure the parent class responsible to send e-mails.
  71. # config.parent_mailer = 'ActionMailer::Base'
  72. # ==> ORM configuration
  73. # Load and configure the ORM. Supports :active_record (default) and
  74. # :mongoid (bson_ext recommended) by default. Other ORMs may be
  75. # available as additional gems.
  76. ======= ======= >>>>>>> 8249ff3 (Add login registration pages) ======= >>>>>>> e989024 (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 75fa7e1 (Rebased) ======= >>>>>>> 4f4ea3f (Featire specs) ======= ======= >>>>>>> 13fca83 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 29e1af9 (Add login registration pages)
  77. >>>>>>> 6066f92 (Add login registration pages) 1 =======
  78. <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
  79. >>>>>>> 730a8ca (Add login registration pages) =======
  80. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) =======
  81. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD require 'devise/orm/active_record' ======= # are not: uncommented lines are intended to protect your configuration from >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD require 'devise/orm/active_record' ======= # are not: uncommented lines are intended to protect your configuration from >>>>>>> 1214e1f (Add login registration pages) ======= # are not: uncommented lines are intended to protect your configuration from >>>>>>> 730a8ca (Add login registration pages) ======= # are not: uncommented lines are intended to protect your configuration from >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) ======= require 'devise/orm/active_record' >>>>>>> 49e8a6c (Rebased)
  82. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  83. # ==> Configuration for any authentication mechanism
  84. # Configure which keys are used when authenticating a user. The default is
  85. # just :email. You can configure it to use [:username, :subdomain], so for
  86. # authenticating a user, both parameters are required. Remember that those
  87. # parameters are used only when authenticating and not when retrieving from
  88. # session. If you need permissions, you should implement that in a before filter.
  89. # You can also supply a hash where the value is a boolean determining whether
  90. # or not authentication should be aborted when the value is not present.
  91. # config.authentication_keys = [:email]
  92. # Configure parameters from the request object used for authentication. Each entry
  93. # given should be a request method and it will automatically be passed to the
  94. # find_for_authentication method and considered in your model lookup. For instance,
  95. # if you set :request_keys to [:subdomain], :subdomain will be used on authentication.
  96. # The same considerations mentioned for authentication_keys also apply to request_keys.
  97. # config.request_keys = []
  98. # Configure which authentication keys should be case-insensitive.
  99. # These keys will be downcased upon creating or modifying a user and when used
  100. # to authenticate or find a user. Default is :email.
  101. ======= ======= >>>>>>> 8249ff3 (Add login registration pages) ======= >>>>>>> e989024 (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 75fa7e1 (Rebased) ======= >>>>>>> 4f4ea3f (Featire specs) ======= ======= >>>>>>> 13fca83 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 29e1af9 (Add login registration pages)
  102. >>>>>>> 6066f92 (Add login registration pages) 1 =======
  103. <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
  104. >>>>>>> 730a8ca (Add login registration pages) =======
  105. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) =======
  106. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.case_insensitive_keys = [:email] ======= # breaking changes in upgrades (i.e., in the event that future versions of >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD config.case_insensitive_keys = [:email] ======= # breaking changes in upgrades (i.e., in the event that future versions of >>>>>>> 1214e1f (Add login registration pages) ======= # breaking changes in upgrades (i.e., in the event that future versions of >>>>>>> 730a8ca (Add login registration pages) ======= # breaking changes in upgrades (i.e., in the event that future versions of >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) ======= config.case_insensitive_keys = [:email] >>>>>>> 49e8a6c (Rebased)
  107. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  108. # Configure which authentication keys should have whitespace stripped.
  109. # These keys will have whitespace before and after removed upon creating or
  110. # modifying a user and when used to authenticate or find a user. Default is :email.
  111. ======= ======= >>>>>>> 8249ff3 (Add login registration pages) ======= >>>>>>> e989024 (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 75fa7e1 (Rebased) ======= >>>>>>> 4f4ea3f (Featire specs) ======= ======= >>>>>>> 13fca83 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 29e1af9 (Add login registration pages)
  112. >>>>>>> 6066f92 (Add login registration pages) 1 =======
  113. <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
  114. >>>>>>> 730a8ca (Add login registration pages) =======
  115. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) =======
  116. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.strip_whitespace_keys = [:email] ======= # Devise change the default values for those options). >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD config.strip_whitespace_keys = [:email] ======= # Devise change the default values for those options). >>>>>>> 1214e1f (Add login registration pages) ======= # Devise change the default values for those options). >>>>>>> 730a8ca (Add login registration pages) ======= # Devise change the default values for those options). >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) ======= config.strip_whitespace_keys = [:email] >>>>>>> 49e8a6c (Rebased)
  117. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  118. # Tell if authentication through request.params is enabled. True by default.
  119. # It can be set to an array that will enable params authentication only for the
  120. # given strategies, for example, `config.params_authenticatable = [:database]` will
  121. # enable it only for database (email + password) authentication.
  122. # config.params_authenticatable = true
  123. # Tell if authentication through HTTP Auth is enabled. False by default.
  124. # It can be set to an array that will enable http authentication only for the
  125. # given strategies, for example, `config.http_authenticatable = [:database]` will
  126. # enable it only for database authentication.
  127. # For API-only applications to support authentication "out-of-the-box", you will likely want to
  128. # enable this with :database unless you are using a custom strategy.
  129. # The supported strategies are:
  130. # :database = Support basic authentication with authentication key + password
  131. # config.http_authenticatable = false
  132. # If 401 status code should be returned for AJAX requests. True by default.
  133. # config.http_authenticatable_on_xhr = true
  134. # The realm used in Http Basic Authentication. 'Application' by default.
  135. # config.http_authentication_realm = 'Application'
  136. # It will change confirmation, password recovery and other workflows
  137. # to behave the same regardless if the e-mail provided was right or wrong.
  138. # Does not affect registerable.
  139. # config.paranoid = true
  140. # By default Devise will store the user in session. You can skip storage for
  141. # particular strategies by setting this option.
  142. # Notice that if you are skipping storage for all authentication paths, you
  143. # may want to disable generating routes to Devise's sessions controller by
  144. # passing skip: :sessions to `devise_for` in your config/routes.rb
  145. ======= ======= >>>>>>> 8249ff3 (Add login registration pages) ======= >>>>>>> e989024 (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 75fa7e1 (Rebased) ======= >>>>>>> 4f4ea3f (Featire specs) ======= ======= >>>>>>> 13fca83 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 29e1af9 (Add login registration pages)
  146. >>>>>>> 6066f92 (Add login registration pages) 1 =======
  147. <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
  148. >>>>>>> 730a8ca (Add login registration pages) =======
  149. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) =======
  150. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.skip_session_storage = [:http_auth] ======= # >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD config.skip_session_storage = [:http_auth] ======= # >>>>>>> 1214e1f (Add login registration pages) ======= # >>>>>>> 730a8ca (Add login registration pages) ======= # >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) ======= config.skip_session_storage = [:http_auth] >>>>>>> 49e8a6c (Rebased)
  151. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  152. # By default, Devise cleans up the CSRF token on authentication to
  153. # avoid CSRF token fixation attacks. This means that, when using AJAX
  154. # requests for sign in and sign up, you need to get a new CSRF token
  155. # from the server. You can disable this option at your own risk.
  156. # config.clean_up_csrf_token_on_authentication = true
  157. # When false, Devise will not attempt to reload routes on eager load.
  158. # This can reduce the time taken to boot the app but if your application
  159. # requires the Devise mappings to be loaded during boot time the application
  160. # won't boot properly.
  161. # config.reload_routes = true
  162. # ==> Configuration for :database_authenticatable
  163. # For bcrypt, this is the cost for hashing the password and defaults to 12. If
  164. # using other algorithms, it sets how many times you want the password to be hashed.
  165. # The number of stretches used for generating the hashed password are stored
  166. # with the hashed password. This allows you to change the stretches without
  167. # invalidating existing passwords.
  168. #
  169. # Limiting the stretches to just one in testing will increase the performance of
  170. # your test suite dramatically. However, it is STRONGLY RECOMMENDED to not use
  171. # a value less than 10 in other environments. Note that, for bcrypt (the default
  172. # algorithm), the cost increases exponentially with the number of stretches (e.g.
  173. # a value of 20 is already extremely slow: approx. 60 seconds for 1 calculation).
  174. ======= ======= >>>>>>> 8249ff3 (Add login registration pages) ======= >>>>>>> e989024 (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 75fa7e1 (Rebased) ======= >>>>>>> 4f4ea3f (Featire specs) ======= ======= >>>>>>> 13fca83 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 29e1af9 (Add login registration pages)
  175. >>>>>>> 6066f92 (Add login registration pages) 1 =======
  176. <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
  177. >>>>>>> 730a8ca (Add login registration pages) =======
  178. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) =======
  179. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.stretches = Rails.env.test? ? 1 : 12 ======= # Use this hook to configure devise mailer, warden hooks and so forth. >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD config.stretches = Rails.env.test? ? 1 : 12 ======= # Use this hook to configure devise mailer, warden hooks and so forth. >>>>>>> 1214e1f (Add login registration pages) ======= # Use this hook to configure devise mailer, warden hooks and so forth. >>>>>>> 730a8ca (Add login registration pages) ======= # Use this hook to configure devise mailer, warden hooks and so forth. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) ======= config.stretches = Rails.env.test? ? 1 : 12 >>>>>>> 49e8a6c (Rebased)
  180. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  181. # Set up a pepper to generate the hashed password.
  182. # config.pepper = 'ceca2dd0db4a8ea4b0604585575dbae22182ecf60d97a87f4914cc23cfe747f8ff22aac7e416e94240a6fe3cfe3cea929d0a8278c66c5388d059bf5bcfdc8a27'
  183. # Send a notification to the original email when the user's email is changed.
  184. # config.send_email_changed_notification = false
  185. # Send a notification email when the user's password is changed.
  186. # config.send_password_change_notification = false
  187. # ==> Configuration for :confirmable
  188. # A period that the user is allowed to access the website even without
  189. # confirming their account. For instance, if set to 2.days, the user will be
  190. # able to access the website for two days without confirming their account,
  191. # access will be blocked just in the third day.
  192. # You can also set it to nil, which will allow the user to access the website
  193. # without confirming their account.
  194. # Default is 0.days, meaning the user cannot access the website without
  195. # confirming their account.
  196. # config.allow_unconfirmed_access_for = 2.days
  197. # A period that the user is allowed to confirm their account before their
  198. # token becomes invalid. For example, if set to 3.days, the user can confirm
  199. # their account within 3 days after the mail was sent, but on the fourth day
  200. # their account can't be confirmed with the token any more.
  201. # Default is nil, meaning there is no restriction on how long a user can take
  202. # before confirming their account.
  203. # config.confirm_within = 3.days
  204. # If true, requires any email changes to be confirmed (exactly the same way as
  205. # initial account confirmation) to be applied. Requires additional unconfirmed_email
  206. # db field (see migrations). Until confirmed, new email is stored in
  207. # unconfirmed_email column, and copied to email column on successful confirmation.
  208. ======= ======= >>>>>>> 8249ff3 (Add login registration pages) ======= >>>>>>> e989024 (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 75fa7e1 (Rebased) ======= >>>>>>> 4f4ea3f (Featire specs) ======= ======= >>>>>>> 13fca83 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 29e1af9 (Add login registration pages)
  209. >>>>>>> 6066f92 (Add login registration pages) 1 =======
  210. <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
  211. >>>>>>> 730a8ca (Add login registration pages) =======
  212. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) =======
  213. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.reconfirmable = true ======= # Many of these configuration options can be set straight in your model. >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD config.reconfirmable = true ======= # Many of these configuration options can be set straight in your model. >>>>>>> 1214e1f (Add login registration pages) ======= # Many of these configuration options can be set straight in your model. >>>>>>> 730a8ca (Add login registration pages) ======= # Many of these configuration options can be set straight in your model. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) ======= config.reconfirmable = true >>>>>>> 49e8a6c (Rebased)
  214. # Defines which key will be used when confirming an account
  215. # config.confirmation_keys = [:email]
  216. # ==> Configuration for :rememberable
  217. # The time the user will be remembered without asking for credentials again.
  218. # config.remember_for = 2.weeks
  219. # Invalidates all the remember me tokens when the user signs out.
  220. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.expire_all_remember_me_on_sign_out = true ======= Devise.setup do |config| >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD config.expire_all_remember_me_on_sign_out = true ======= Devise.setup do |config| >>>>>>> 1214e1f (Add login registration pages) ======= Devise.setup do |config| >>>>>>> 730a8ca (Add login registration pages) ======= Devise.setup do |config| >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) ======= config.expire_all_remember_me_on_sign_out = true >>>>>>> 49e8a6c (Rebased)
  221. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  222. # If true, extends the user's remember period when remembered via cookie.
  223. # config.extend_remember_period = false
  224. # Options to be passed to the created cookie. For instance, you can set
  225. # secure: true in order to force SSL only cookies.
  226. # config.rememberable_options = {}
  227. # ==> Configuration for :validatable
  228. # Range for password length.
  229. ======= ======= >>>>>>> 8249ff3 (Add login registration pages) ======= >>>>>>> e989024 (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 75fa7e1 (Rebased) ======= >>>>>>> 4f4ea3f (Featire specs) ======= ======= >>>>>>> 13fca83 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 29e1af9 (Add login registration pages)
  230. >>>>>>> 6066f92 (Add login registration pages) 1 =======
  231. <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
  232. >>>>>>> 730a8ca (Add login registration pages) =======
  233. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) =======
  234. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.password_length = 6..128 ======= # The secret key used by Devise. Devise uses this key to generate >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD config.password_length = 6..128 ======= # The secret key used by Devise. Devise uses this key to generate >>>>>>> 1214e1f (Add login registration pages) ======= # The secret key used by Devise. Devise uses this key to generate >>>>>>> 730a8ca (Add login registration pages) ======= # The secret key used by Devise. Devise uses this key to generate >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) ======= config.password_length = 6..128 >>>>>>> 49e8a6c (Rebased)
  235. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  236. # Email regex used to validate email formats. It simply asserts that
  237. # one (and only one) @ exists in the given string. This is mainly
  238. # to give user feedback and not to assert the e-mail validity.
  239. ======= ======= >>>>>>> 8249ff3 (Add login registration pages) ======= >>>>>>> e989024 (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 75fa7e1 (Rebased) ======= >>>>>>> 4f4ea3f (Featire specs) ======= ======= >>>>>>> 13fca83 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 29e1af9 (Add login registration pages)
  240. >>>>>>> 6066f92 (Add login registration pages) 1 =======
  241. <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
  242. >>>>>>> 730a8ca (Add login registration pages) =======
  243. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) =======
  244. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.email_regexp = /\A[^@\s]+@[^@\s]+\z/ ======= # random tokens. Changing this key will render invalid all existing >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD config.email_regexp = /\A[^@\s]+@[^@\s]+\z/ ======= # random tokens. Changing this key will render invalid all existing >>>>>>> 1214e1f (Add login registration pages) ======= # random tokens. Changing this key will render invalid all existing >>>>>>> 730a8ca (Add login registration pages) ======= # random tokens. Changing this key will render invalid all existing >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) ======= config.email_regexp = /\A[^@\s]+@[^@\s]+\z/ >>>>>>> 49e8a6c (Rebased)
  245. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  246. # ==> Configuration for :timeoutable
  247. # The time you want to timeout the user session without activity. After this
  248. # time the user will be asked for credentials again. Default is 30 minutes.
  249. # config.timeout_in = 30.minutes
  250. # ==> Configuration for :lockable
  251. # Defines which strategy will be used to lock an account.
  252. # :failed_attempts = Locks an account after a number of failed attempts to sign in.
  253. # :none = No lock strategy. You should handle locking by yourself.
  254. # config.lock_strategy = :failed_attempts
  255. # Defines which key will be used when locking and unlocking an account
  256. # config.unlock_keys = [:email]
  257. # Defines which strategy will be used to unlock an account.
  258. # :email = Sends an unlock link to the user email
  259. # :time = Re-enables login after a certain amount of time (see :unlock_in below)
  260. # :both = Enables both strategies
  261. # :none = No unlock strategy. You should handle unlocking by yourself.
  262. # config.unlock_strategy = :both
  263. # Number of authentication tries before locking an account if lock_strategy
  264. # is failed attempts.
  265. # config.maximum_attempts = 20
  266. # Time interval to unlock the account if :time is enabled as unlock_strategy.
  267. # config.unlock_in = 1.hour
  268. # Warn on the last attempt before the account is locked.
  269. # config.last_attempt_warning = true
  270. # ==> Configuration for :recoverable
  271. #
  272. # Defines which key will be used when recovering the password for an account
  273. # config.reset_password_keys = [:email]
  274. # Time interval you can reset your password with a reset password key.
  275. # Don't put a too small interval or your users won't have the time to
  276. # change their passwords.
  277. ======= ======= >>>>>>> 8249ff3 (Add login registration pages) ======= >>>>>>> e989024 (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 75fa7e1 (Rebased) ======= >>>>>>> 4f4ea3f (Featire specs) ======= ======= >>>>>>> 13fca83 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 29e1af9 (Add login registration pages)
  278. >>>>>>> 6066f92 (Add login registration pages) 1 =======
  279. <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
  280. >>>>>>> 730a8ca (Add login registration pages) =======
  281. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) =======
  282. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.reset_password_within = 6.hours ======= # confirmation, reset password and unlock tokens in the database. >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD config.reset_password_within = 6.hours ======= # confirmation, reset password and unlock tokens in the database. >>>>>>> 1214e1f (Add login registration pages) ======= # confirmation, reset password and unlock tokens in the database. >>>>>>> 730a8ca (Add login registration pages) ======= # confirmation, reset password and unlock tokens in the database. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) ======= config.reset_password_within = 6.hours >>>>>>> 49e8a6c (Rebased)
  283. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  284. # When set to false, does not sign a user in automatically after their password is
  285. # reset. Defaults to true, so a user is signed in automatically after a reset.
  286. # config.sign_in_after_reset_password = true
  287. # ==> Configuration for :encryptable
  288. # Allow you to use another hashing or encryption algorithm besides bcrypt (default).
  289. # You can use :sha1, :sha512 or algorithms from others authentication tools as
  290. # :clearance_sha1, :authlogic_sha512 (then you should set stretches above to 20
  291. # for default behavior) and :restful_authentication_sha1 (then you should set
  292. # stretches to 10, and copy REST_AUTH_SITE_KEY to pepper).
  293. #
  294. # Require the `devise-encryptable` gem when using anything other than bcrypt
  295. # config.encryptor = :sha512
  296. # ==> Scopes configuration
  297. # Turn scoped views on. Before rendering "sessions/new", it will first check for
  298. # "users/sessions/new". It's turned off by default because it's slower if you
  299. # are using only default views.
  300. # config.scoped_views = false
  301. # Configure the default scope given to Warden. By default it's the first
  302. # devise role declared in your routes (usually :user).
  303. # config.default_scope = :user
  304. # Set this configuration to false if you want /users/sign_out to sign out
  305. # only the current scope. By default, Devise signs out all scopes.
  306. # config.sign_out_all_scopes = true
  307. # ==> Navigation configuration
  308. # Lists the formats that should be treated as navigational. Formats like
  309. # :html, should redirect to the sign in page when the user does not have
  310. # access, but formats like :xml or :json, should return 401.
  311. #
  312. # If you have any extra navigational formats, like :iphone or :mobile, you
  313. # should add them to the navigational formats lists.
  314. #
  315. # The "*/*" below is required to match Internet Explorer requests.
  316. # config.navigational_formats = ['*/*', :html]
  317. # The default HTTP method used to sign out a resource. Default is :delete.
  318. ======= ======= >>>>>>> 8249ff3 (Add login registration pages) ======= >>>>>>> e989024 (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 75fa7e1 (Rebased) ======= >>>>>>> 4f4ea3f (Featire specs) ======= ======= >>>>>>> 13fca83 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 29e1af9 (Add login registration pages)
  319. >>>>>>> 6066f92 (Add login registration pages) 1 =======
  320. <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
  321. >>>>>>> 730a8ca (Add login registration pages) =======
  322. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) =======
  323. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.sign_out_via = :delete ======= # Devise will use the `secret_key_base` as its `secret_key` >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD config.sign_out_via = :delete ======= # Devise will use the `secret_key_base` as its `secret_key` >>>>>>> 1214e1f (Add login registration pages) ======= # Devise will use the `secret_key_base` as its `secret_key` >>>>>>> 730a8ca (Add login registration pages) ======= # Devise will use the `secret_key_base` as its `secret_key` >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) ======= config.sign_out_via = :delete >>>>>>> 49e8a6c (Rebased)
  324. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  325. ======= ======= >>>>>>> 8249ff3 (Add login registration pages) ======= >>>>>>> e989024 (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 4f4ea3f (Featire specs) ======= ======= >>>>>>> 13fca83 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 29e1af9 (Add login registration pages)
  326. 1 =======
  327. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f92 (Add login registration pages) ======= =======
  328. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3 (Add login registration pages) ======= =======
  329. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> e989024 (Add login registration pages) =======
  330. 1 >>>>>>> 75fa7e1 (Rebased) ======= >>>>>>> df37394 (Featire specs) >>>>>>> 4f4ea3f (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
  331. >>>>>>> 730a8ca (Add login registration pages) =======
  332. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af9 (Add login registration pages) ======= =======
  333. 1 >>>>>>> 49e8a6c (Rebased) >>>>>>> 13fca83 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 8249ff3 (Add login registration pages) ======= >>>>>>> e989024 (Add login registration pages) <<<<<<< HEAD config.omniauth :facebook, ======= # by default. You can change it below and use your own secret key. >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f92 (Add login registration pages) ======= ======= # by default. You can change it below and use your own secret key. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3 (Add login registration pages) ======= ======= # by default. You can change it below and use your own secret key. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> e989024 (Add login registration pages) ======= config.omniauth :facebook, >>>>>>> 75fa7e1 (Rebased) ======= ======= >>>>>>> 29e1af9 (Add login registration pages) ======= >>>>>>> 13fca83 (Rebased) config.omniauth :facebook, ======= # by default. You can change it below and use your own secret key. >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD config.omniauth :facebook, ======= # by default. You can change it below and use your own secret key. >>>>>>> 1214e1f (Add login registration pages) ======= # by default. You can change it below and use your own secret key. >>>>>>> 730a8ca (Add login registration pages) ======= # by default. You can change it below and use your own secret key. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af9 (Add login registration pages) ======= ======= config.omniauth :facebook, >>>>>>> 49e8a6c (Rebased) >>>>>>> 13fca83 (Rebased)
  334. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD # ==> OmniAuth ======= ======= >>>>>>> 8249ff3 (Add login registration pages) ======= >>>>>>> e989024 (Add login registration pages) <<<<<<< HEAD Rails.application.credentials.dig(:facebook, :FACEBOOK_ID), ======= # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24' >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f92 (Add login registration pages) ======= ======= # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24' >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3 (Add login registration pages) ======= ======= # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24' >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> e989024 (Add login registration pages) ======= Rails.application.credentials.dig(:facebook, :FACEBOOK_ID), >>>>>>> 75fa7e1 (Rebased) ======= ======= >>>>>>> 29e1af9 (Add login registration pages) ======= >>>>>>> 13fca83 (Rebased) Rails.application.credentials.dig(:facebook, :FACEBOOK_ID), ======= # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24' >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD Rails.application.credentials.dig(:facebook, :FACEBOOK_ID), ======= # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24' >>>>>>> 1214e1f (Add login registration pages) ======= # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24' >>>>>>> 730a8ca (Add login registration pages) ======= # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24' >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af9 (Add login registration pages) ======= ======= Rails.application.credentials.dig(:facebook, :FACEBOOK_ID), >>>>>>> 49e8a6c (Rebased) >>>>>>> 13fca83 (Rebased)
  335. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD # Add a new OmniAuth provider. Check the wiki for more information on setting ======= ======= >>>>>>> 8249ff3 (Add login registration pages) ======= >>>>>>> e989024 (Add login registration pages) <<<<<<< HEAD Rails.application.credentials.dig(:facebook, :FACEBOOK_SECRET), ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f92 (Add login registration pages) ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3 (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> e989024 (Add login registration pages) ======= Rails.application.credentials.dig(:facebook, :FACEBOOK_SECRET), >>>>>>> 75fa7e1 (Rebased) ======= ======= >>>>>>> 29e1af9 (Add login registration pages) ======= >>>>>>> 13fca83 (Rebased) Rails.application.credentials.dig(:facebook, :FACEBOOK_SECRET), ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD Rails.application.credentials.dig(:facebook, :FACEBOOK_SECRET), ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af9 (Add login registration pages) ======= ======= Rails.application.credentials.dig(:facebook, :FACEBOOK_SECRET), >>>>>>> 49e8a6c (Rebased) >>>>>>> 13fca83 (Rebased)
  336. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD # up on your models and hooks. ======= ======= >>>>>>> 8249ff3 (Add login registration pages) ======= >>>>>>> e989024 (Add login registration pages) <<<<<<< HEAD scope: 'email', info_fields: 'email,name' ======= # ==> Controller configuration >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f92 (Add login registration pages) ======= ======= # ==> Controller configuration >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3 (Add login registration pages) ======= ======= # ==> Controller configuration >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> e989024 (Add login registration pages) ======= scope: 'email', info_fields: 'email,name' >>>>>>> 75fa7e1 (Rebased) ======= ======= >>>>>>> 29e1af9 (Add login registration pages) ======= >>>>>>> 13fca83 (Rebased) scope: 'email', info_fields: 'email,name' ======= # ==> Controller configuration >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD scope: 'email', info_fields: 'email,name' ======= # ==> Controller configuration >>>>>>> 1214e1f (Add login registration pages) ======= # ==> Controller configuration >>>>>>> 730a8ca (Add login registration pages) ======= # ==> Controller configuration >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af9 (Add login registration pages) ======= ======= scope: 'email', info_fields: 'email,name' >>>>>>> 49e8a6c (Rebased) >>>>>>> 13fca83 (Rebased)
  337. # config.omniauth :github, 'APP_ID', 'APP_SECRET', scope: 'user,public_repo'
  338. # ==> Warden configuration
  339. # If you want to use other strategies, that are not supported by Devise, or
  340. # change the failure app, you can configure them inside the config.warden block.
  341. #
  342. # config.warden do |manager|
  343. # manager.intercept_401 = false
  344. # manager.default_strategies(scope: :user).unshift :some_external_strategy
  345. # end
  346. # ==> Mountable engine configurations
  347. # When using Devise inside an engine, let's call it `MyEngine`, and this engine
  348. # is mountable, there are some extra configurations to be taken into account.
  349. # The following options are available, assuming the engine is mounted as:
  350. #
  351. # mount MyEngine, at: '/my_engine'
  352. #
  353. # The router that invoked `devise_for`, in the example above, would be:
  354. # config.router_name = :my_engine
  355. #
  356. # When using OmniAuth, Devise cannot automatically set OmniAuth path,
  357. # so you need to do it manually. For the users scope, it would be:
  358. # config.omniauth_path_prefix = '/my_engine/users/auth'
  359. # ==> Turbolinks configuration
  360. # If your app is using Turbolinks, Turbolinks::Controller needs to be included to make redirection work correctly:
  361. #
  362. # ActiveSupport.on_load(:devise_failure_app) do
  363. # include Turbolinks::Controller
  364. # end
  365. # ==> Configuration for :registerable
  366. # When set to false, does not sign a user in automatically after their password is
  367. # changed. Defaults to true, so a user is signed in automatically after changing a password.
  368. # config.sign_in_after_change_password = true
  369. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= ======= >>>>>>> 793a6ed (Add login registration pages) ======= >>>>>>> c5efe8e (Add login registration pages) ======= ======= >>>>>>> 311e9fa (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD ======= ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages) # Configure the parent class to the devise controllers.
  370. # config.parent_controller = 'DeviseController'
  371. # ==> Mailer Configuration
  372. # Configure the e-mail address which will be shown in Devise::Mailer,
  373. # note that it will be overwritten if you use your own mailer class
  374. # with default "from" parameter.
  375. 1 config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com'
  376. # Configure the class responsible to send e-mails.
  377. # config.mailer = 'Devise::Mailer'
  378. # Configure the parent class responsible to send e-mails.
  379. # config.parent_mailer = 'ActionMailer::Base'
  380. # ==> ORM configuration
  381. # Load and configure the ORM. Supports :active_record (default) and
  382. # :mongoid (bson_ext recommended) by default. Other ORMs may be
  383. # available as additional gems.
  384. 1 require 'devise/orm/active_record'
  385. # ==> Configuration for any authentication mechanism
  386. # Configure which keys are used when authenticating a user. The default is
  387. # just :email. You can configure it to use [:username, :subdomain], so for
  388. # authenticating a user, both parameters are required. Remember that those
  389. # parameters are used only when authenticating and not when retrieving from
  390. # session. If you need permissions, you should implement that in a before filter.
  391. # You can also supply a hash where the value is a boolean determining whether
  392. # or not authentication should be aborted when the value is not present.
  393. # config.authentication_keys = [:email]
  394. # Configure parameters from the request object used for authentication. Each entry
  395. # given should be a request method and it will automatically be passed to the
  396. # find_for_authentication method and considered in your model lookup. For instance,
  397. # if you set :request_keys to [:subdomain], :subdomain will be used on authentication.
  398. # The same considerations mentioned for authentication_keys also apply to request_keys.
  399. # config.request_keys = []
  400. # Configure which authentication keys should be case-insensitive.
  401. # These keys will be downcased upon creating or modifying a user and when used
  402. # to authenticate or find a user. Default is :email.
  403. 1 config.case_insensitive_keys = [:email]
  404. # Configure which authentication keys should have whitespace stripped.
  405. # These keys will have whitespace before and after removed upon creating or
  406. # modifying a user and when used to authenticate or find a user. Default is :email.
  407. 1 config.strip_whitespace_keys = [:email]
  408. # Tell if authentication through request.params is enabled. True by default.
  409. # It can be set to an array that will enable params authentication only for the
  410. # given strategies, for example, `config.params_authenticatable = [:database]` will
  411. # enable it only for database (email + password) authentication.
  412. # config.params_authenticatable = true
  413. # Tell if authentication through HTTP Auth is enabled. False by default.
  414. # It can be set to an array that will enable http authentication only for the
  415. # given strategies, for example, `config.http_authenticatable = [:database]` will
  416. # enable it only for database authentication.
  417. # For API-only applications to support authentication "out-of-the-box", you will likely want to
  418. # enable this with :database unless you are using a custom strategy.
  419. # The supported strategies are:
  420. # :database = Support basic authentication with authentication key + password
  421. # config.http_authenticatable = false
  422. # If 401 status code should be returned for AJAX requests. True by default.
  423. # config.http_authenticatable_on_xhr = true
  424. # The realm used in Http Basic Authentication. 'Application' by default.
  425. # config.http_authentication_realm = 'Application'
  426. # It will change confirmation, password recovery and other workflows
  427. # to behave the same regardless if the e-mail provided was right or wrong.
  428. # Does not affect registerable.
  429. # config.paranoid = true
  430. # By default Devise will store the user in session. You can skip storage for
  431. # particular strategies by setting this option.
  432. # Notice that if you are skipping storage for all authentication paths, you
  433. # may want to disable generating routes to Devise's sessions controller by
  434. # passing skip: :sessions to `devise_for` in your config/routes.rb
  435. 1 config.skip_session_storage = [:http_auth]
  436. # By default, Devise cleans up the CSRF token on authentication to
  437. # avoid CSRF token fixation attacks. This means that, when using AJAX
  438. # requests for sign in and sign up, you need to get a new CSRF token
  439. # from the server. You can disable this option at your own risk.
  440. # config.clean_up_csrf_token_on_authentication = true
  441. # When false, Devise will not attempt to reload routes on eager load.
  442. # This can reduce the time taken to boot the app but if your application
  443. # requires the Devise mappings to be loaded during boot time the application
  444. # won't boot properly.
  445. # config.reload_routes = true
  446. # ==> Configuration for :database_authenticatable
  447. # For bcrypt, this is the cost for hashing the password and defaults to 12. If
  448. # using other algorithms, it sets how many times you want the password to be hashed.
  449. # The number of stretches used for generating the hashed password are stored
  450. # with the hashed password. This allows you to change the stretches without
  451. # invalidating existing passwords.
  452. #
  453. # Limiting the stretches to just one in testing will increase the performance of
  454. # your test suite dramatically. However, it is STRONGLY RECOMMENDED to not use
  455. # a value less than 10 in other environments. Note that, for bcrypt (the default
  456. # algorithm), the cost increases exponentially with the number of stretches (e.g.
  457. # a value of 20 is already extremely slow: approx. 60 seconds for 1 calculation).
  458. 1 config.stretches = Rails.env.test? ? 1 : 12
  459. # Set up a pepper to generate the hashed password.
  460. # config.pepper = 'ceca2dd0db4a8ea4b0604585575dbae22182ecf60d97a87f4914cc23cfe747f8ff22aac7e416e94240a6fe3cfe3cea929d0a8278c66c5388d059bf5bcfdc8a27'
  461. # Send a notification to the original email when the user's email is changed.
  462. # config.send_email_changed_notification = false
  463. # Send a notification email when the user's password is changed.
  464. # config.send_password_change_notification = false
  465. # ==> Configuration for :confirmable
  466. # A period that the user is allowed to access the website even without
  467. # confirming their account. For instance, if set to 2.days, the user will be
  468. # able to access the website for two days without confirming their account,
  469. # access will be blocked just in the third day.
  470. # You can also set it to nil, which will allow the user to access the website
  471. # without confirming their account.
  472. # Default is 0.days, meaning the user cannot access the website without
  473. # confirming their account.
  474. # config.allow_unconfirmed_access_for = 2.days
  475. # A period that the user is allowed to confirm their account before their
  476. # token becomes invalid. For example, if set to 3.days, the user can confirm
  477. # their account within 3 days after the mail was sent, but on the fourth day
  478. # their account can't be confirmed with the token any more.
  479. # Default is nil, meaning there is no restriction on how long a user can take
  480. # before confirming their account.
  481. # config.confirm_within = 3.days
  482. # If true, requires any email changes to be confirmed (exactly the same way as
  483. # initial account confirmation) to be applied. Requires additional unconfirmed_email
  484. # db field (see migrations). Until confirmed, new email is stored in
  485. # unconfirmed_email column, and copied to email column on successful confirmation.
  486. 1 config.reconfirmable = true
  487. # Defines which key will be used when confirming an account
  488. # config.confirmation_keys = [:email]
  489. # ==> Configuration for :rememberable
  490. # The time the user will be remembered without asking for credentials again.
  491. # config.remember_for = 2.weeks
  492. # Invalidates all the remember me tokens when the user signs out.
  493. 1 config.expire_all_remember_me_on_sign_out = true
  494. # If true, extends the user's remember period when remembered via cookie.
  495. # config.extend_remember_period = false
  496. # Options to be passed to the created cookie. For instance, you can set
  497. # secure: true in order to force SSL only cookies.
  498. # config.rememberable_options = {}
  499. # ==> Configuration for :validatable
  500. # Range for password length.
  501. 1 config.password_length = 6..128
  502. # Email regex used to validate email formats. It simply asserts that
  503. # one (and only one) @ exists in the given string. This is mainly
  504. # to give user feedback and not to assert the e-mail validity.
  505. 1 config.email_regexp = /\A[^@\s]+@[^@\s]+\z/
  506. # ==> Configuration for :timeoutable
  507. # The time you want to timeout the user session without activity. After this
  508. # time the user will be asked for credentials again. Default is 30 minutes.
  509. # config.timeout_in = 30.minutes
  510. # ==> Configuration for :lockable
  511. # Defines which strategy will be used to lock an account.
  512. # :failed_attempts = Locks an account after a number of failed attempts to sign in.
  513. # :none = No lock strategy. You should handle locking by yourself.
  514. # config.lock_strategy = :failed_attempts
  515. # Defines which key will be used when locking and unlocking an account
  516. # config.unlock_keys = [:email]
  517. # Defines which strategy will be used to unlock an account.
  518. # :email = Sends an unlock link to the user email
  519. # :time = Re-enables login after a certain amount of time (see :unlock_in below)
  520. # :both = Enables both strategies
  521. # :none = No unlock strategy. You should handle unlocking by yourself.
  522. # config.unlock_strategy = :both
  523. # Number of authentication tries before locking an account if lock_strategy
  524. # is failed attempts.
  525. # config.maximum_attempts = 20
  526. # Time interval to unlock the account if :time is enabled as unlock_strategy.
  527. # config.unlock_in = 1.hour
  528. # Warn on the last attempt before the account is locked.
  529. # config.last_attempt_warning = true
  530. # ==> Configuration for :recoverable
  531. #
  532. # Defines which key will be used when recovering the password for an account
  533. # config.reset_password_keys = [:email]
  534. # Time interval you can reset your password with a reset password key.
  535. # Don't put a too small interval or your users won't have the time to
  536. # change their passwords.
  537. 1 config.reset_password_within = 6.hours
  538. # When set to false, does not sign a user in automatically after their password is
  539. # reset. Defaults to true, so a user is signed in automatically after a reset.
  540. # config.sign_in_after_reset_password = true
  541. # ==> Configuration for :encryptable
  542. # Allow you to use another hashing or encryption algorithm besides bcrypt (default).
  543. # You can use :sha1, :sha512 or algorithms from others authentication tools as
  544. # :clearance_sha1, :authlogic_sha512 (then you should set stretches above to 20
  545. # for default behavior) and :restful_authentication_sha1 (then you should set
  546. # stretches to 10, and copy REST_AUTH_SITE_KEY to pepper).
  547. #
  548. # Require the `devise-encryptable` gem when using anything other than bcrypt
  549. # config.encryptor = :sha512
  550. # ==> Scopes configuration
  551. # Turn scoped views on. Before rendering "sessions/new", it will first check for
  552. # "users/sessions/new". It's turned off by default because it's slower if you
  553. # are using only default views.
  554. # config.scoped_views = false
  555. # Configure the default scope given to Warden. By default it's the first
  556. # devise role declared in your routes (usually :user).
  557. # config.default_scope = :user
  558. # Set this configuration to false if you want /users/sign_out to sign out
  559. # only the current scope. By default, Devise signs out all scopes.
  560. # config.sign_out_all_scopes = true
  561. # ==> Navigation configuration
  562. # Lists the formats that should be treated as navigational. Formats like
  563. # :html, should redirect to the sign in page when the user does not have
  564. # access, but formats like :xml or :json, should return 401.
  565. #
  566. # If you have any extra navigational formats, like :iphone or :mobile, you
  567. # should add them to the navigational formats lists.
  568. #
  569. # The "*/*" below is required to match Internet Explorer requests.
  570. # config.navigational_formats = ['*/*', :html]
  571. # The default HTTP method used to sign out a resource. Default is :delete.
  572. 1 config.sign_out_via = :delete
  573. # ==> OmniAuth
  574. # Add a new OmniAuth provider. Check the wiki for more information on setting
  575. # up on your models and hooks.
  576. # config.omniauth :github, 'APP_ID', 'APP_SECRET', scope: 'user,public_repo'
  577. # ==> Warden configuration
  578. # If you want to use other strategies, that are not supported by Devise, or
  579. # change the failure app, you can configure them inside the config.warden block.
  580. #
  581. # config.warden do |manager|
  582. # manager.intercept_401 = false
  583. # manager.default_strategies(scope: :user).unshift :some_external_strategy
  584. # end
  585. # ==> Mountable engine configurations
  586. # When using Devise inside an engine, let's call it `MyEngine`, and this engine
  587. # is mountable, there are some extra configurations to be taken into account.
  588. # The following options are available, assuming the engine is mounted as:
  589. #
  590. # mount MyEngine, at: '/my_engine'
  591. #
  592. # The router that invoked `devise_for`, in the example above, would be:
  593. # config.router_name = :my_engine
  594. #
  595. # When using OmniAuth, Devise cannot automatically set OmniAuth path,
  596. # so you need to do it manually. For the users scope, it would be:
  597. # config.omniauth_path_prefix = '/my_engine/users/auth'
  598. # ==> Turbolinks configuration
  599. # If your app is using Turbolinks, Turbolinks::Controller needs to be included to make redirection work correctly:
  600. #
  601. # ActiveSupport.on_load(:devise_failure_app) do
  602. # include Turbolinks::Controller
  603. # end
  604. # ==> Configuration for :registerable
  605. # When set to false, does not sign a user in automatically after their password is
  606. # changed. Defaults to true, so a user is signed in automatically after changing a password.
  607. # config.sign_in_after_change_password = true
  608. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> c5efe8e (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f92 (Add login registration pages) ======= >>>>>>> 8249ff3 (Add login registration pages) ======= >>>>>>> e989024 (Add login registration pages) ======= >>>>>>> 75fa7e1 (Rebased) ======= >>>>>>> 8480924 (Featire specs) ======= >>>>>>> 4f4ea3f (Featire specs) ======= >>>>>>> 365d41e (Featire specs) ======= >>>>>>> 29e1af9 (Add login registration pages) ======= >>>>>>> 13fca83 (Rebased) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> aca90e3 (Rebased) ======= ======= <<<<<<< HEAD ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 6066f92 (Add login registration pages) ======= >>>>>>> 793a6ed (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 8249ff3 (Add login registration pages) ======= >>>>>>> c5efe8e (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> e989024 (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 365d41e (Featire specs) >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f92 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024 (Add login registration pages) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= ======= ======= >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af9 (Add login registration pages) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs)

config/initializers/filter_parameter_logging.rb

100.0% lines covered

1 relevant lines. 1 lines covered and 0 lines missed.
    
  1. # Be sure to restart your server when you modify this file.
  2. # Configure sensitive parameters which will be filtered from the log file.
  3. 1 Rails.application.config.filter_parameters += %i[
  4. passw secret token _key crypt salt certificate otp ssn
  5. ]

config/initializers/inflections.rb

100.0% lines covered

0 relevant lines. 0 lines covered and 0 lines missed.
    
  1. # Be sure to restart your server when you modify this file.
  2. # Add new inflection rules using the following format. Inflections
  3. # are locale specific, and you may define rules for as many different
  4. # locales as you wish. All of these examples are active by default:
  5. # ActiveSupport::Inflector.inflections(:en) do |inflect|
  6. # inflect.plural /^(ox)$/i, '\1en'
  7. # inflect.singular /^(ox)en/i, '\1'
  8. # inflect.irregular 'person', 'people'
  9. # inflect.uncountable %w( fish sheep )
  10. # end
  11. # These inflection rules are supported but not enabled by default:
  12. # ActiveSupport::Inflector.inflections(:en) do |inflect|
  13. # inflect.acronym 'RESTful'
  14. # end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= >>>>>>> 34509ee (Featire specs) ======= >>>>>>> 75fa7e1 (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 365d41e (Featire specs) ======= >>>>>>> c05ee51 (Featire specs) ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> 13fca83 (Rebased) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 1ca9c0e (Featire specs) ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs)

config/initializers/kaminari.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 Kaminari.configure do |config|
  2. 1 config.page_method_name = :per_page_kaminari
  3. end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509ee (Featire specs) ======= >>>>>>> 75fa7e1 (Rebased) ======= ======= >>>>>>> 13fca83 (Rebased) ======= >>>>>>> f136376 (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs)

config/initializers/mime_types.rb

100.0% lines covered

0 relevant lines. 0 lines covered and 0 lines missed.
    
  1. # Be sure to restart your server when you modify this file.
  2. # Add new mime types for use in respond_to blocks:
  3. # Mime::Type.register "text/richtext", :rtf
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 88d49ad (Add login registration pages) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages)
======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f92 (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3 (Add login registration pages) ======= ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024 (Add login registration pages) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 75fa7e1 (Rebased)
>>>>>>> aca90e3 (Rebased) <<<<<<< HEAD ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs)
>>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs)

config/initializers/money.rb

100.0% lines covered

3 relevant lines. 3 lines covered and 0 lines missed.
    
  1. 1 Money.locale_backend = :i18n
  2. 1 Money.rounding_mode = BigDecimal::ROUND_HALF_EVEN
  3. 1 Money.default_currency = Money::Currency.new('EUR')
<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f92 (Add login registration pages) ======= >>>>>>> 75fa7e1 (Rebased) ======= >>>>>>> 8480924 (Featire specs) ======= >>>>>>> 4f4ea3f (Featire specs) ======= >>>>>>> 13fca83 (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f92 (Add login registration pages) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3 (Add login registration pages) ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024 (Add login registration pages) ======= ======= >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= >>>>>>> 311e9fa (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af9 (Add login registration pages) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) >>>>>>> 13fca83 (Rebased)

config/initializers/omniauth.rb

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f92 (Add login registration pages) ======= ======= >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3 (Add login registration pages) ======= ======= >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024 (Add login registration pages) ======= ======= >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= >>>>>>> 311e9fa (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages) >>>>>>> 29e1af9 (Add login registration pages) 3 relevant lines. 3 lines covered and ======= 2 relevant lines. 2 lines covered and <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= 3 relevant lines. 3 lines covered and >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f92 (Add login registration pages) ======= ======= ======= 2 relevant lines. 2 lines covered and >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3 (Add login registration pages) ======= ======= ======= 2 relevant lines. 2 lines covered and >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024 (Add login registration pages) ======= ======= 3 relevant lines. 3 lines covered and >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= ======= 3 relevant lines. 3 lines covered and >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= 2 relevant lines. 2 lines covered and >>>>>>> 730a8ca (Add login registration pages) ======= 2 relevant lines. 2 lines covered and >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af9 (Add login registration pages) ======= ======= ======= 3 relevant lines. 3 lines covered and >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) >>>>>>> 13fca83 (Rebased) 0 lines missed.
    
  1. 1 <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f92 (Add login registration pages) ======= ======= >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3 (Add login registration pages) ======= ======= >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024 (Add login registration pages) ======= ======= >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= >>>>>>> 311e9fa (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af9 (Add login registration pages) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) >>>>>>> 13fca83 (Rebased) OmniAuth.config.logger = Rails.logger
  2. 1 <<<<<<< HEAD ======= >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f92 (Add login registration pages) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3 (Add login registration pages) ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024 (Add login registration pages) ======= ======= >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= >>>>>>> 311e9fa (Rebased) ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af9 (Add login registration pages) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) >>>>>>> 13fca83 (Rebased) Rails.application.config.middleware.use OmniAuth::Builder do
  3. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f92 (Add login registration pages) ======= >>>>>>> 8249ff3 (Add login registration pages) ======= >>>>>>> e989024 (Add login registration pages) ======= >>>>>>> 75fa7e1 (Rebased) ======= >>>>>>> 8480924 (Featire specs) ======= >>>>>>> 4f4ea3f (Featire specs) ======= >>>>>>> 29e1af9 (Add login registration pages) ======= >>>>>>> 13fca83 (Rebased)
  4. =======
  5. >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= =======
  6. >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> 793a6ed (Add login registration pages) ======= >>>>>>> c5efe8e (Add login registration pages)
  7. =======
  8. >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f92 (Add login registration pages) ======= ======= =======
  9. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3 (Add login registration pages) ======= ======= =======
  10. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024 (Add login registration pages) ======= =======
  11. >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= =======
  12. >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased)
  13. =======
  14. >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD
  15. =======
  16. >>>>>>> 1214e1f (Add login registration pages) =======
  17. >>>>>>> 730a8ca (Add login registration pages) =======
  18. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af9 (Add login registration pages) ======= ======= =======
  19. >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) >>>>>>> 13fca83 (Rebased) 1 <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f92 (Add login registration pages) ======= >>>>>>> 8249ff3 (Add login registration pages) ======= >>>>>>> e989024 (Add login registration pages) ======= >>>>>>> 75fa7e1 (Rebased) ======= >>>>>>> 8480924 (Featire specs) ======= >>>>>>> 4f4ea3f (Featire specs) ======= >>>>>>> 29e1af9 (Add login registration pages) ======= >>>>>>> 13fca83 (Rebased) provider :facebook, ======= provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET'] >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= provider :facebook, >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> 793a6ed (Add login registration pages) ======= >>>>>>> c5efe8e (Add login registration pages) provider :facebook, ======= provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET'] >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f92 (Add login registration pages) ======= ======= ======= provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET'] >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3 (Add login registration pages) ======= ======= ======= provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET'] >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024 (Add login registration pages) ======= ======= provider :facebook, >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= ======= provider :facebook, >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased) provider :facebook, ======= provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET'] >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD provider :facebook, ======= provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET'] >>>>>>> 1214e1f (Add login registration pages) ======= provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET'] >>>>>>> 730a8ca (Add login registration pages) ======= provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET'] >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af9 (Add login registration pages) ======= ======= ======= provider :facebook, >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) >>>>>>> 13fca83 (Rebased)
  20. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f92 (Add login registration pages) ======= ======= >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3 (Add login registration pages) ======= ======= >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024 (Add login registration pages) ======= ======= >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= >>>>>>> 311e9fa (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af9 (Add login registration pages) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) >>>>>>> 13fca83 (Rebased)
  21. Rails.application.credentials.dig(:facebook, :FACEBOOK_ID),
  22. Rails.application.credentials.dig(:facebook, :FACEBOOK_SECRET),
  23. scope: 'email', info_fields: 'email,name'
  24. <<<<<<< HEAD =======
  25. >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  26. >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 9a49b7b (Rebased) ======= =======
  27. >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f92 (Add login registration pages) ======= ======= =======
  28. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3 (Add login registration pages) ======= ======= =======
  29. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024 (Add login registration pages) ======= ======= >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= >>>>>>> 311e9fa (Rebased) =======
  30. <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) =======
  31. >>>>>>> 730a8ca (Add login registration pages) =======
  32. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af9 (Add login registration pages) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) >>>>>>> 13fca83 (Rebased) end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f92 (Add login registration pages) ======= >>>>>>> 8249ff3 (Add login registration pages) ======= >>>>>>> e989024 (Add login registration pages) ======= >>>>>>> 75fa7e1 (Rebased) ======= >>>>>>> 8480924 (Featire specs) ======= >>>>>>> 4f4ea3f (Featire specs) ======= >>>>>>> 365d41e (Featire specs) ======= >>>>>>> 29e1af9 (Add login registration pages) ======= >>>>>>> 13fca83 (Rebased) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> aca90e3 (Rebased) ======= ======= <<<<<<< HEAD ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 6066f92 (Add login registration pages) ======= >>>>>>> 793a6ed (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 8249ff3 (Add login registration pages) ======= >>>>>>> c5efe8e (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> e989024 (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 365d41e (Featire specs) >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f92 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024 (Add login registration pages) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= ======= ======= >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af9 (Add login registration pages) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs)

config/initializers/permissions_policy.rb

100.0% lines covered

0 relevant lines. 0 lines covered and 0 lines missed.
    
  1. # Define an application-wide HTTP permissions policy. For further
  2. # information see https://developers.google.com/web/updates/2018/06/feature-policy
  3. #
  4. # Rails.application.config.permissions_policy do |f|
  5. # f.camera :none
  6. # f.gyroscope :none
  7. # f.microphone :none
  8. # f.usb :none
  9. # f.fullscreen :self
  10. # f.payment :self, "https://secure.example.com"
  11. # end

config/initializers/wrap_parameters.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. # Be sure to restart your server when you modify this file.
  2. # This file contains settings for ActionController::ParamsWrapper which
  3. # is enabled by default.
  4. # Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
  5. 1 ActiveSupport.on_load(:action_controller) do
  6. 2 wrap_parameters format: [:json]
  7. end
  8. # To enable root element in JSON for ActiveRecord objects.
  9. # ActiveSupport.on_load(:active_record) do
  10. # self.include_root_in_json = true
  11. # end

config/routes.rb

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f92 (Add login registration pages) ======= >>>>>>> 6e923b9 (Featire specs) ======= >>>>>>> 8249ff3 (Add login registration pages) ======= >>>>>>> 34509ee (Featire specs) ======= >>>>>>> e989024 (Add login registration pages) ======= >>>>>>> 75fa7e1 (Rebased) ======= >>>>>>> 8480924 (Featire specs) ======= >>>>>>> d8dd3b4 (Featire specs) ======= >>>>>>> 4f4ea3f (Featire specs) ======= >>>>>>> 365d41e (Featire specs) ======= >>>>>>> c05ee51 (Featire specs) ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> 29e1af9 (Add login registration pages) ======= >>>>>>> 13fca83 (Rebased) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 1ca9c0e (Featire specs) 4 relevant lines. 4 lines covered and ======= 3 relevant lines. 3 lines covered and >>>>>>> 08edf50 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> aca90e3 (Rebased) ======= <<<<<<< HEAD ======= ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f92 (Add login registration pages) ======= ======= >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3 (Add login registration pages) ======= ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024 (Add login registration pages) ======= ======= >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) 3 relevant lines. 3 lines covered and ======= ======= ======= >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) ======= ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) 3 relevant lines. 3 lines covered and ======= ======= >>>>>>> 22ee41c (Add login registration pages) ======= 3 relevant lines. 3 lines covered and ======= >>>>>>> df37394 (Featire specs) >>>>>>> 4f4ea3f (Featire specs) <<<<<<< HEAD 4 relevant lines. 4 lines covered and ======= 3 relevant lines. 3 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) 9 relevant lines. 9 lines covered and >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> cacbab9 (Add login registration pages) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages) 9 relevant lines. 9 lines covered and ======= 9 relevant lines. 9 lines covered and >>>>>>> 9620751 (Featire specs) ======= 3 relevant lines. 3 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= 3 relevant lines. 3 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= ======= 3 relevant lines. 3 lines covered and >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f92 (Add login registration pages) ======= ======= ======= ======= 3 relevant lines. 3 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3 (Add login registration pages) ======= ======= ======= ======= 3 relevant lines. 3 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024 (Add login registration pages) ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= ======= 3 relevant lines. 3 lines covered and >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) ======= ======= 3 relevant lines. 3 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af9 (Add login registration pages) ======= ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs) 0 lines missed.
    
  1. 1 Rails.application.routes.draw do
  2. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f92 (Add login registration pages) ======= >>>>>>> 6e923b9 (Featire specs) ======= >>>>>>> 8249ff3 (Add login registration pages) ======= >>>>>>> 34509ee (Featire specs) ======= >>>>>>> e989024 (Add login registration pages) ======= >>>>>>> 75fa7e1 (Rebased) ======= >>>>>>> 8480924 (Featire specs) ======= >>>>>>> d8dd3b4 (Featire specs) ======= >>>>>>> 4f4ea3f (Featire specs) ======= >>>>>>> 365d41e (Featire specs) ======= >>>>>>> c05ee51 (Featire specs) ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> 29e1af9 (Add login registration pages) ======= >>>>>>> 13fca83 (Rebased) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 1ca9c0e (Featire specs) devise_for :users ======= root 'home#index' >>>>>>> 08edf50 (Featire specs) ======= devise_for :admin_users, ActiveAdmin::Devise.config >>>>>>> aca90e3 (Rebased) ======= <<<<<<< HEAD ======= ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f92 (Add login registration pages) ======= ======= >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3 (Add login registration pages) ======= ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024 (Add login registration pages) ======= ======= >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) root 'home#index' ======= ======= ======= >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) ======= ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) root 'home#index' ======= ======= >>>>>>> 22ee41c (Add login registration pages) ======= root 'home#index' ======= >>>>>>> df37394 (Featire specs) >>>>>>> 4f4ea3f (Featire specs) <<<<<<< HEAD devise_for :users ======= root 'home#index' >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= ======= devise_for :users >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= ======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) devise_for :admin_users, ActiveAdmin::Devise.config >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> cacbab9 (Add login registration pages) devise_for :admin_users, ActiveAdmin::Devise.config ======= devise_for :users >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f92 (Add login registration pages) ======= ======= ======= ======= root 'home#index' >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= ======= ======= devise_for :users >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3 (Add login registration pages) ======= ======= ======= ======= root 'home#index' >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= ======= ======= devise_for :users >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024 (Add login registration pages) ======= ======= ======= devise_for :admin_users, ActiveAdmin::Devise.config >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= ======= ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) devise_for :admin_users, ActiveAdmin::Devise.config >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) devise_for :admin_users, ActiveAdmin::Devise.config ======= devise_for :users >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= ======= root 'home#index' >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= ======= devise_for :users >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) ======= ======= root 'home#index' >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= ======= devise_for :users >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af9 (Add login registration pages) ======= ======= ======= ======= devise_for :admin_users, ActiveAdmin::Devise.config >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) >>>>>>> 13fca83 (Rebased)
  3. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f92 (Add login registration pages) ======= >>>>>>> 6e923b9 (Featire specs) ======= >>>>>>> 8249ff3 (Add login registration pages) ======= >>>>>>> 34509ee (Featire specs) ======= >>>>>>> e989024 (Add login registration pages) ======= >>>>>>> 75fa7e1 (Rebased) ======= >>>>>>> 8480924 (Featire specs) ======= >>>>>>> 4f4ea3f (Featire specs) ======= >>>>>>> fc3774f (Featire specs) root 'home#index' ======= ActiveAdmin.routes(self) >>>>>>> aca90e3 (Rebased) ======= ======= <<<<<<< HEAD ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 98beee2 (Manifest_cache true) ======= >>>>>>> 156ffe6 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 6066f92 (Add login registration pages) ======= >>>>>>> adc21e0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= >>>>>>> 793a6ed (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 8249ff3 (Add login registration pages) ======= >>>>>>> 4d90e3d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= >>>>>>> c5efe8e (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> e989024 (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) ======= >>>>>>> fc3774f (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) >>>>>>> d8abfed (Featire specs) root 'home#index' <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= ActiveAdmin.routes(self) >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> bf554f4 (Rebased) ActiveAdmin.routes(self) ======= ======= ActiveAdmin.routes(self) >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ActiveAdmin.routes(self) ======= resources :books, only: %i[show index] ======= root 'home#index' >>>>>>> 1214e1f (Add login registration pages) ======= resources :books, only: %i[show index] >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= root 'home#index' >>>>>>> 730a8ca (Add login registration pages) ======= resources :books, only: %i[show index] >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= root 'home#index' >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) ======= ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ActiveAdmin.routes(self) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= ======= resources :books, only: %i[show index]
  4. end
<<<<<<< HEAD <<<<<<< HEAD

spec/decorators/author_decorator_spec.rb

=======

spec/decorators/book_decorator_spec.rb

>>>>>>> bd8bda4 (Manifest_cache true)

100.0% lines covered

<<<<<<< HEAD 7 relevant lines. 7 lines covered and ======= 12 relevant lines. 12 lines covered and >>>>>>> bd8bda4 (Manifest_cache true) 0 lines missed.
    
  1. 1 require 'rails_helper'
  2. 1 <<<<<<< HEAD RSpec.describe AuthorDecorator do
  3. 2 let(:decorator) { described_class.new(author) } >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true)
  4. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased)
  5. 1 <<<<<<< HEAD resources :books, only: %i[show index]
  6. <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) end
>>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD root 'home#index' >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
=======

spec/decorators/author_decorator_spec.rb

100.0% lines covered

7 relevant lines. 7 lines covered and 0 lines missed.
    
  1. 1 require 'rails_helper'
  2. 1 RSpec.describe AuthorDecorator do
  3. 2 let(:decorator) { described_class.new(author) }
  4. 2 let(:author) { FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk') }
  5. 1 context 'when decorate' do
  6. 1 it '#full_name' do
  7. 1 expect(decorator.full_name).to eq('Vlad Todorchuk')
  8. end
  9. end
  10. end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)

spec/decorators/author_decorator_spec.rb

=======

spec/decorators/book_decorator_spec.rb

>>>>>>> bd8bda4 (Manifest_cache true) =======

spec/decorators/book_decorator_spec.rb

>>>>>>> aa7b40c (Manifest_cache true)

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 7 relevant lines. 7 lines covered and ======= 12 relevant lines. 12 lines covered and >>>>>>> bd8bda4 (Manifest_cache true) ======= 12 relevant lines. 12 lines covered and >>>>>>> aa7b40c (Manifest_cache true) ======= 7 relevant lines. 7 lines covered and ======= 13 relevant lines. 13 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) 0 lines missed.
    
  1. 1 require 'rails_helper'
  2. 1 <<<<<<< HEAD <<<<<<< HEAD RSpec.describe AuthorDecorator do
  3. 2 let(:decorator) { described_class.new(author) } >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true)
  4. <<<<<<< HEAD
  5. =======
  6. 2 let(:author) { FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk') }
  7. 1 context 'when decorate' do
  8. 1 it '#full_name' do
  9. 1 expect(decorator.full_name).to eq('Vlad Todorchuk')
  10. end
  11. end
  12. ======= >>>>>>> 7a02bbe (Featire specs) end
<<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price)

spec/decorators/book_decorator_spec.rb

>>>>>>> bd8bda4 (Manifest_cache true) =======

spec/decorators/book_decorator_spec.rb

>>>>>>> aa7b40c (Manifest_cache true)

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 7 relevant lines. 7 lines covered and ======= 12 relevant lines. 12 lines covered and >>>>>>> bd8bda4 (Manifest_cache true) ======= 12 relevant lines. 12 lines covered and >>>>>>> aa7b40c (Manifest_cache true) ======= 13 relevant lines. 13 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) 0 lines missed.
    
  1. 1 require 'rails_helper'
  2. >>>>>>> e5752db (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD resources :books, only: %i[show index]
  3. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price)
=======

spec/decorators/author_decorator_spec.rb

100.0% lines covered

7 relevant lines. 7 lines covered and 0 lines missed.
    
  1. 1 require 'rails_helper'
  2. 1 RSpec.describe AuthorDecorator do
  3. 2 let(:decorator) { described_class.new(author) }
  4. 2 let(:author) { FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk') }
  5. 1 context 'when decorate' do
  6. 1 it '#full_name' do
  7. 1 expect(decorator.full_name).to eq('Vlad Todorchuk')
  8. end
  9. end
  10. end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)

spec/decorators/author_decorator_spec.rb

=======

spec/decorators/book_decorator_spec.rb

>>>>>>> bd8bda4 (Manifest_cache true) =======

spec/decorators/book_decorator_spec.rb

>>>>>>> aa7b40c (Manifest_cache true)

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 7 relevant lines. 7 lines covered and ======= 12 relevant lines. 12 lines covered and >>>>>>> bd8bda4 (Manifest_cache true) ======= 12 relevant lines. 12 lines covered and >>>>>>> aa7b40c (Manifest_cache true) ======= 7 relevant lines. 7 lines covered and ======= 13 relevant lines. 13 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) 0 lines missed.
    
  1. 1 require 'rails_helper'
  2. 1 <<<<<<< HEAD <<<<<<< HEAD RSpec.describe AuthorDecorator do
  3. 2 let(:decorator) { described_class.new(author) } >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 98beee2 (Manifest_cache true) >>>>>>> 490b01d (Manifest_cache true)
  4. 1 <<<<<<< HEAD ======= context 'when decorate' do
  5. 1 it '#full_name' do
  6. 1 expect(decorator.full_name).to eq('Vlad Todorchuk')
  7. end
  8. end
  9. ======= >>>>>>> 7a02bbe (Featire specs) end
<<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price)

spec/decorators/book_decorator_spec.rb

>>>>>>> bd8bda4 (Manifest_cache true) =======

spec/decorators/book_decorator_spec.rb

>>>>>>> aa7b40c (Manifest_cache true)

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 7 relevant lines. 7 lines covered and ======= 12 relevant lines. 12 lines covered and >>>>>>> bd8bda4 (Manifest_cache true) ======= 12 relevant lines. 12 lines covered and >>>>>>> aa7b40c (Manifest_cache true) ======= 13 relevant lines. 13 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) 0 lines missed.
    
  1. 1 require 'rails_helper'
  2. 1 <<<<<<< HEAD <<<<<<< HEAD RSpec.describe AuthorDecorator do
  3. 2 <<<<<<< HEAD let(:decorator) { described_class.new(author) } >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 98beee2 (Manifest_cache true) ======= ======= ======= let(:book_decorator) { described_class.new(book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> bc757df (Fix book_spec decrease quantity and price)
  4. 3 let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
  5. 1 <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 4f4ea3f (Featire specs) >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) >>>>>>> 4f4ea3f (Featire specs) resources :books, only: %i[show index]
  6. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs)
  7. ======= ======= ======= >>>>>>> c51bf93 (Featire specs)
  8. ======= ======= >>>>>>> 22ee41c (Add login registration pages) =======
  9. ======= >>>>>>> df37394 (Featire specs) >>>>>>> 4f4ea3f (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs)
  10. =======
  11. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= =======
  12. >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) >>>>>>> 4f4ea3f (Featire specs) end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price)

spec/decorators/author_decorator_spec.rb

100.0% lines covered

7 relevant lines. 7 lines covered and 0 lines missed.
    
  1. 1 require 'rails_helper'
  2. 1 RSpec.describe AuthorDecorator do
  3. 2 let(:decorator) { described_class.new(author) }
  4. 2 let(:author) { FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk') } ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) devise_for :users >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 311e9fa (Rebased) devise_for :users >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs)
  5. 1 devise_for :users, as: 'omniauth', controller: { omniauth_callbacks: 'callbacks' }
  6. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) root 'home#index'
  7. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs)
  8. 1 resources :users
  9. 1 resources :books, only: %i[show index] do
  10. 1 resources :reviews, only: :create
  11. end
  12. end
<<<<<<< HEAD
======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 78717cc (Manifest_cache true) ======= >>>>>>> 84d0df6 (Manifest_cache true) ======= >>>>>>> 450f4e3 (Manifest_cache true) ======= >>>>>>> aa3618b (Rebased) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 00f8b58 (Manifest_cache true)
>>>>>>> c033601 (Rebased) >>>>>>> 9a49b7b (Rebased) >>>>>>> 75fa7e1 (Rebased)

spec/decorators/author_decorator_spec.rb

<<<<<<< HEAD ======= =======

spec/decorators/book_decorator_spec.rb

>>>>>>> 02a399d (Manifest_cache true) =======

spec/decorators/book_decorator_spec.rb

>>>>>>> 183b6c5 (Manifest_cache true) =======

spec/decorators/book_decorator_spec.rb

>>>>>>> fd6db03 (Manifest_cache true) =======

spec/decorators/author_decorator_spec.rb

>>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= =======
>>>>>>> c033601 (Rebased)

spec/decorators/author_decorator_spec.rb

<<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= <<<<<<< HEAD ======= =======

spec/decorators/book_decorator_spec.rb

>>>>>>> 02a399d (Manifest_cache true) =======

spec/decorators/book_decorator_spec.rb

>>>>>>> 183b6c5 (Manifest_cache true) =======

spec/decorators/book_decorator_spec.rb

>>>>>>> fd6db03 (Manifest_cache true) =======

spec/decorators/author_decorator_spec.rb

>>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= =======

spec/decorators/author_decorator_spec.rb

=======

spec/decorators/book_decorator_spec.rb

>>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) >>>>>>> 0341d6d (Manifest_cache true)

100.0% lines covered

<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) 5 relevant lines. 5 lines covered and <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) 12 relevant lines. 12 lines covered and ======= <<<<<<< HEAD 13 relevant lines. 13 lines covered and ======= 12 relevant lines. 12 lines covered and >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= 12 relevant lines. 12 lines covered and >>>>>>> bd8bda4 (Manifest_cache true) ======= 12 relevant lines. 12 lines covered and >>>>>>> aa7b40c (Manifest_cache true) ======= 12 relevant lines. 12 lines covered and >>>>>>> 183b6c5 (Manifest_cache true) ======= 13 relevant lines. 13 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= 5 relevant lines. 5 lines covered and >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> c8da2e3 (Fix) ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 00f8b58 (Manifest_cache true) 5 relevant lines. 5 lines covered and ======= 5 relevant lines. 5 lines covered and >>>>>>> 845dac1 (Manifest_cache true) ======= 12 relevant lines. 12 lines covered and >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 78717cc (Manifest_cache true) ======= ======= >>>>>>> c8da2e3 (Fix) ======= ======= 12 relevant lines. 12 lines covered and >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= >>>>>>> c8da2e3 (Fix) ======= ======= 12 relevant lines. 12 lines covered and >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= >>>>>>> c8da2e3 (Fix) ======= 5 relevant lines. 5 lines covered and >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) >>>>>>> 0341d6d (Manifest_cache true) 0 lines missed.
    
  1. 1 <<<<<<< HEAD RSpec.describe AuthorDecorator, type: :decorator do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD RSpec.describe AuthorDecorator, type: :decorator do ======= ======= RSpec.describe AuthorDecorator, type: :decorator do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 845dac1 (Manifest_cache true) RSpec.describe AuthorDecorator, type: :decorator do ======= >>>>>>> c8da2e3 (Fix) require 'rails_helper' >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD ======= require 'rails_helper' >>>>>>> 183b6c5 (Manifest_cache true) ======= require 'rails_helper' >>>>>>> fd6db03 (Manifest_cache true) ======= RSpec.describe AuthorDecorator, type: :decorator do >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= RSpec.describe AuthorDecorator, type: :decorator do >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> ae884b4 (Fix) ======= >>>>>>> 0341d6d (Manifest_cache true) ======= RSpec.describe AuthorDecorator, type: :decorator do >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) >>>>>>> 0341d6d (Manifest_cache true)
  2. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= >>>>>>> 8480924 (Featire specs) ======= >>>>>>> 5a2009f (Fix)
  3. 2 subject(:decorated_object) { described_class.new(author) }
  4. <<<<<<< HEAD ======= ======= ======= >>>>>>> 78717cc (Manifest_cache true) ======= >>>>>>> 84d0df6 (Manifest_cache true) ======= >>>>>>> 450f4e3 (Manifest_cache true) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD
  5. >>>>>>> 9a49b7b (Rebased) >>>>>>> 67ab529 (Fix) <<<<<<< HEAD ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true)
  6. 2 >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix)
  7. <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= =======
  8. ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> 845dac1 (Manifest_cache true)
  9. 2 >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) >>>>>>> 0341d6d (Manifest_cache true)
  10. <<<<<<< HEAD
  11. 2 =======
  12. 1 >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD let(:author) { create(:author) } ======= RSpec.describe BookDecorator do >>>>>>> 824bb2b (Featire specs)
  13. <<<<<<< HEAD
  14. ======= <<<<<<< HEAD <<<<<<< HEAD
  15. ======= ======= >>>>>>> 824bb2b (Featire specs)
  16. 3 <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) subject(:book_decorator) { described_class.new(book) } ======= <<<<<<< HEAD let(:book_decorator) { described_class.new(book) } ======= subject(:book_decorator) { described_class.new(book) } >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= subject(:book_decorator) { described_class.new(book) } >>>>>>> bd8bda4 (Manifest_cache true) ======= subject(:book_decorator) { described_class.new(book) } >>>>>>> aa7b40c (Manifest_cache true) ======= subject(:book_decorator) { described_class.new(book) } >>>>>>> 183b6c5 (Manifest_cache true) ======= let(:book_decorator) { described_class.new(book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
  17. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
  18. ======= <<<<<<< HEAD ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price)
  19. 3 let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
  20. <<<<<<< HEAD =======
  21. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
  22. >>>>>>> bd8bda4 (Manifest_cache true) =======
  23. >>>>>>> aa7b40c (Manifest_cache true) =======
  24. >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= =======
  25. >>>>>>> 02a399d (Manifest_cache true) =======
  26. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= =======
  27. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> 450f4e3 (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs)
  28. <<<<<<< HEAD
  29. ======= <<<<<<< HEAD <<<<<<< HEAD
  30. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
  31. ======= <<<<<<< HEAD
  32. =======
  33. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
  34. >>>>>>> bd8bda4 (Manifest_cache true) =======
  35. >>>>>>> aa7b40c (Manifest_cache true) =======
  36. >>>>>>> 183b6c5 (Manifest_cache true) =======
  37. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) 1 <<<<<<< HEAD describe '#full_name' do ======= let(:authors) do >>>>>>> 824bb2b (Featire specs)
  38. <<<<<<< HEAD
  39. 2 it { expect(decorated_object.full_name).to eq("#{author.first_name} #{author.last_name}") }
  40. <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
  41. ======= <<<<<<< HEAD
  42. =======
  43. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
  44. >>>>>>> bd8bda4 (Manifest_cache true) =======
  45. >>>>>>> aa7b40c (Manifest_cache true) =======
  46. >>>>>>> 183b6c5 (Manifest_cache true) =======
  47. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) <<<<<<< HEAD end ======= [ >>>>>>> 824bb2b (Featire specs)
  48. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8480924 (Featire specs)
  49. <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
  50. ======= <<<<<<< HEAD
  51. =======
  52. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
  53. >>>>>>> bd8bda4 (Manifest_cache true) =======
  54. >>>>>>> aa7b40c (Manifest_cache true) =======
  55. >>>>>>> 183b6c5 (Manifest_cache true) =======
  56. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> b9cc4e9 (Manifest_cache true)
  57. >>>>>>> c033601 (Rebased) 2 =======
  58. 2 >>>>>>> a5d032d (Fix) =======
  59. >>>>>>> c033601 (Rebased) 2 <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= =======
  60. 2 >>>>>>> a5d032d (Fix) >>>>>>> c8da2e3 (Fix) subject(:decorated_object) { described_class.new(author) }
  61. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
  62. ======= <<<<<<< HEAD
  63. =======
  64. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
  65. >>>>>>> bd8bda4 (Manifest_cache true) =======
  66. >>>>>>> aa7b40c (Manifest_cache true) =======
  67. >>>>>>> 183b6c5 (Manifest_cache true) =======
  68. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
  69. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) >>>>>>> c033601 (Rebased) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= =======
  70. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> b9cc4e9 (Manifest_cache true) =======
  71. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= ======= =======
  72. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true)
  73. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
  74. ======= <<<<<<< HEAD
  75. =======
  76. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
  77. >>>>>>> bd8bda4 (Manifest_cache true) =======
  78. >>>>>>> aa7b40c (Manifest_cache true) =======
  79. >>>>>>> 183b6c5 (Manifest_cache true) =======
  80. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
  81. 2 =======
  82. 1 >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD ] ======= <<<<<<< HEAD let(:author) { create(:author) } ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) RSpec.describe BookDecorator do
  83. 3 subject(:book_decorator) { described_class.new(book) } <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true)
  84. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
  85. ======= <<<<<<< HEAD
  86. =======
  87. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
  88. >>>>>>> bd8bda4 (Manifest_cache true) =======
  89. >>>>>>> aa7b40c (Manifest_cache true) =======
  90. >>>>>>> 183b6c5 (Manifest_cache true) =======
  91. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
  92. 1 <<<<<<< HEAD <<<<<<< HEAD describe '#full_name' do
  93. 2 it { expect(decorated_object.full_name).to eq("#{author.first_name} #{author.last_name}") }
  94. <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) ======= end
  95. end
======= >>>>>>> ae2a012 (Manifest_cache true)

spec/decorators/book_decorator_spec.rb

100.0% lines covered

<<<<<<< HEAD 15 relevant lines. 15 lines covered and ======= <<<<<<< HEAD 13 relevant lines. 13 lines covered and ======= 12 relevant lines. 12 lines covered and >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) 0 lines missed.
    
  1. 1 RSpec.describe BookDecorator do
  2. 4 subject(:decorated_object) { described_class.new(book) }
  3. ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs)
  4. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD let(:book) do ======= resources :books, only: %i[show index] >>>>>>> d0dc1f1 (Featire specs) ======= RSpec.describe BookDecorator do ======= resources :books, only: %i[show index] >>>>>>> 752f0c0 (Featire specs)
  5. <<<<<<< HEAD
  6. 3 <<<<<<< HEAD let(:book_decorator) { described_class.new(book) } ======= subject(:book_decorator) { described_class.new(book) } >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true)
  7. <<<<<<< HEAD
  8. 3 create(:book, price_cents: 123, authors: authors, categories: categories,
  9. =======
  10. >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD categories_count: 0, ======= =======
  11. <<<<<<< HEAD
  12. =======
  13. >>>>>>> ae2a012 (Manifest_cache true) 1 >>>>>>> 7375d4b (Manifest_cache true) let(:authors) do >>>>>>> 02a399d (Manifest_cache true) ======= let(:authors) do >>>>>>> bd8bda4 (Manifest_cache true)
  14. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bd8bda4 (Manifest_cache true)
  15. <<<<<<< HEAD <<<<<<< HEAD authors_count: 0) ======= [ >>>>>>> 02a399d (Manifest_cache true) ======= [ >>>>>>> bd8bda4 (Manifest_cache true)
  16. <<<<<<< HEAD ======= >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD
  17. =======
  18. >>>>>>> ae2a012 (Manifest_cache true) =======
  19. 2 >>>>>>> 02a399d (Manifest_cache true) =======
  20. 2 >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD end ======= FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'), >>>>>>> 02a399d (Manifest_cache true) ======= FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'), >>>>>>> bd8bda4 (Manifest_cache true)
  21. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  22. 1 =======
  23. >>>>>>> 02a399d (Manifest_cache true) =======
  24. =======
  25. >>>>>>> ae2a012 (Manifest_cache true) 2 >>>>>>> 7375d4b (Manifest_cache true) =======
  26. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD let(:authors) do ======= FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk') >>>>>>> 02a399d (Manifest_cache true) ======= FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk') >>>>>>> bd8bda4 (Manifest_cache true)
  27. <<<<<<< HEAD <<<<<<< HEAD
  28. =======
  29. >>>>>>> ae2a012 (Manifest_cache true) =======
  30. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD [
  31. <<<<<<< HEAD
  32. 3 ======= <<<<<<< HEAD
  33. =======
  34. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) create(:author, first_name: FFaker::Name.first_name, last_name: FFaker::Name.last_name),
  35. <<<<<<< HEAD
  36. =======
  37. >>>>>>> ae2a012 (Manifest_cache true) create(:author, first_name: FFaker::Name.first_name, last_name: FFaker::Name.last_name)
  38. ======= >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> bd8bda4 (Manifest_cache true) ]
  39. <<<<<<< HEAD <<<<<<< HEAD
  40. =======
  41. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) ======= =======
  42. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) end
  43. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD
  44. >>>>>>> 96aecde (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
  45. ======= <<<<<<< HEAD
  46. =======
  47. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= =======
  48. >>>>>>> bd8bda4 (Manifest_cache true) =======
  49. >>>>>>> aa7b40c (Manifest_cache true) =======
  50. >>>>>>> 183b6c5 (Manifest_cache true) =======
  51. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= =======
  52. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) 1 let(:categories) do
  53. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD
  54. >>>>>>> 96aecde (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
  55. ======= <<<<<<< HEAD
  56. =======
  57. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= =======
  58. >>>>>>> bd8bda4 (Manifest_cache true) =======
  59. >>>>>>> aa7b40c (Manifest_cache true) =======
  60. >>>>>>> 183b6c5 (Manifest_cache true) =======
  61. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= =======
  62. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) [
  63. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD
  64. 3 >>>>>>> 96aecde (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
  65. ======= <<<<<<< HEAD
  66. =======
  67. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
  68. >>>>>>> bd8bda4 (Manifest_cache true) =======
  69. >>>>>>> aa7b40c (Manifest_cache true) =======
  70. >>>>>>> 183b6c5 (Manifest_cache true) =======
  71. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> b9cc4e9 (Manifest_cache true)
  72. >>>>>>> c033601 (Rebased) 2 <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) =======
  73. 1 >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD ======= ======= <<<<<<< HEAD
  74. 1 >>>>>>> 183b6c5 (Manifest_cache true) =======
  75. 1 >>>>>>> fd6db03 (Manifest_cache true) =======
  76. 2 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> 5a2009f (Fix) ======= >>>>>>> ae884b4 (Fix) ======= >>>>>>> d245196 (Manifest_cache true) =======
  77. >>>>>>> c033601 (Rebased) 2 >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= =======
  78. 2 >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> d245196 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= >>>>>>> 8480924 (Featire specs) ======= >>>>>>> 5a2009f (Fix) let(:author) { create(:author) } ======= ======= let(:author) { create(:author) } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD let(:author) { create(:author) } ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= create(:category, name: FFaker::Book.genre), >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> a304bcf (Manifest_cache true) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> fd6db03 (Manifest_cache true) ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 251144b (Manifest_cache true) RSpec.describe BookDecorator do ======= let(:author) { create(:author) } >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= let(:author) { create(:author) } >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix)
  79. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix)
  80. 3 <<<<<<< HEAD subject(:book_decorator) { described_class.new(book) } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 02a399d (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> fd6db03 (Manifest_cache true) ======= let(:book_decorator) { described_class.new(book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= FactoryBot.create(:category, name: 'Poetry'), >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) >>>>>>> d782a28 (Manifest_cache true)
  81. <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD
  82. 3 <<<<<<< HEAD subject(:book_decorator) { described_class.new(book) } <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> fd6db03 (Manifest_cache true) ======= let(:book_decorator) { described_class.new(book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price)
  83. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  84. >>>>>>> 96aecde (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
  85. ======= <<<<<<< HEAD
  86. =======
  87. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= =======
  88. >>>>>>> bd8bda4 (Manifest_cache true) =======
  89. >>>>>>> aa7b40c (Manifest_cache true) =======
  90. >>>>>>> 183b6c5 (Manifest_cache true) =======
  91. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
  92. >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
  93. 3 let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
  94. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
  95. >>>>>>> a5d032d (Fix) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= =======
  96. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= =======
  97. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD create(:category, name: FFaker::Book.genre) ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> 02a399d (Manifest_cache true) ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true)
  98. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) =======
  99. >>>>>>> 96aecde (Manifest_cache true) >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
  100. ======= <<<<<<< HEAD
  101. =======
  102. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= =======
  103. >>>>>>> bd8bda4 (Manifest_cache true) =======
  104. >>>>>>> aa7b40c (Manifest_cache true) =======
  105. >>>>>>> 183b6c5 (Manifest_cache true) =======
  106. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= =======
  107. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) =======
  108. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) =======
  109. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) 1 >>>>>>> c033601 (Rebased) =======
  110. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD ======= 1 >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) >>>>>>> ae884b4 (Fix) describe '#full_name' do
  111. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) =======
  112. >>>>>>> 96aecde (Manifest_cache true) >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
  113. ======= <<<<<<< HEAD
  114. =======
  115. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= =======
  116. >>>>>>> bd8bda4 (Manifest_cache true) =======
  117. >>>>>>> aa7b40c (Manifest_cache true) =======
  118. >>>>>>> 183b6c5 (Manifest_cache true) =======
  119. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
  120. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) =======
  121. [
  122. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
  123. >>>>>>> a5d032d (Fix) <<<<<<< HEAD =======
  124. >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= =======
  125. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) 2 it { expect(decorated_object.full_name).to eq("#{author.first_name} #{author.last_name}") }
  126. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix)
  127. >>>>>>> c033601 (Rebased) =======
  128. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD =======
  129. >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= ======= =======
  130. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) end
  131. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> 5a2009f (Fix) ======= >>>>>>> ae884b4 (Fix) ======= >>>>>>> d245196 (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> a304bcf (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 7375d4b (Manifest_cache true) =======
  132. ======= >>>>>>> 7375d4b (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true)
  133. 3 let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
  134. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
  135. <<<<<<< HEAD ======= >>>>>>> 02a399d (Manifest_cache true) =======
  136. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true)
  137. <<<<<<< HEAD
  138. ======= <<<<<<< HEAD <<<<<<< HEAD
  139. =======
  140. >>>>>>> 02a399d (Manifest_cache true) =======
  141. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD describe '#categories_names' do >>>>>>> 96aecde (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) it '#authors_names' do ======= <<<<<<< HEAD context 'when decorate' do ======= it '#authors_names' do >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= it '#authors_names' do >>>>>>> bd8bda4 (Manifest_cache true) ======= it '#authors_names' do >>>>>>> aa7b40c (Manifest_cache true) ======= it '#authors_names' do >>>>>>> 183b6c5 (Manifest_cache true) ======= context 'when decorate' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= it '#authors_names' do >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true)
  142. <<<<<<< HEAD
  143. 1 ======= <<<<<<< HEAD <<<<<<< HEAD
  144. 2 =======
  145. 1 >>>>>>> 02a399d (Manifest_cache true) =======
  146. 1 >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") } >>>>>>> 96aecde (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') ======= <<<<<<< HEAD it '#authors_names' do ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> bd8bda4 (Manifest_cache true) ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> aa7b40c (Manifest_cache true) ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> 183b6c5 (Manifest_cache true) ======= it '#authors_names' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true)
  147. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
  148. ======= <<<<<<< HEAD ======= >>>>>>> 96aecde (Manifest_cache true)
  149. 1 expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
  150. end
  151. 1 it '#categories_names' do
  152. 1 expect(book_decorator.categories_names).to eq('Poetry, Novel')
  153. end
  154. =======
  155. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) =======
  156. >>>>>>> bd8bda4 (Manifest_cache true) =======
  157. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
  158. <<<<<<< HEAD ======= <<<<<<< HEAD
  159. ======= >>>>>>> 7375d4b (Manifest_cache true)
  160. end
  161. 1 it '#categories_names' do
  162. 1 expect(book_decorator.categories_names).to eq('Poetry, Novel')
  163. end
  164. end
  165. <<<<<<< HEAD
  166. <<<<<<< HEAD ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) =======
  167. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= =======
  168. <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= ======= ======= =======
  169. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= =======
  170. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= =======
  171. <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= =======
  172. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
  173. >>>>>>> a5d032d (Fix) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  174. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) >>>>>>> ae884b4 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk')
  175. ]
  176. end
  177. 1 let(:categories) do
  178. [
  179. 2 FactoryBot.create(:category, name: 'Poetry'),
  180. FactoryBot.create(:category, name: 'Novel')
  181. ]
  182. end
  183. 1 context 'when decorate' do
  184. 1 it '#authors_names' do
  185. 1 expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
  186. end
  187. 1 it '#categories_names' do
  188. 1 expect(book_decorator.categories_names).to eq('Poetry, Novel')
  189. end
  190. end
  191. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) end
<<<<<<< HEAD <<<<<<< HEAD
======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 98beee2 (Manifest_cache true) ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab529 (Fix) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> bf137e4 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true)
>>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= =======
>>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= =======
>>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= =======
>>>>>>> a5d032d (Fix) >>>>>>> c8da2e3 (Fix) >>>>>>> 5a2009f (Fix)

spec/decorators/book_decorator_spec.rb

100.0% lines covered

<<<<<<< HEAD 15 relevant lines. 15 lines covered and ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) 15 relevant lines. 15 lines covered and ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD 15 relevant lines. 15 lines covered and ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) 13 relevant lines. 13 lines covered and ======= 12 relevant lines. 12 lines covered and >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= 15 relevant lines. 15 lines covered and >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> 5a2009f (Fix) ======= >>>>>>> ae884b4 (Fix) ======= >>>>>>> 2179316 (Manifest_cache true) ======= 15 relevant lines. 15 lines covered and >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) >>>>>>> 2179316 (Manifest_cache true) 0 lines missed.
    
  1. 1 RSpec.describe BookDecorator do
  2. 4 subject(:decorated_object) { described_class.new(book) }
  3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> 365d41e (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) >>>>>>> 5507b42 (Featire specs) >>>>>>> 932dbec (Featire specs) >>>>>>> f136376 (Featire specs)
  4. 1 <<<<<<< HEAD let(:book) do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> bf137e4 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= <<<<<<< HEAD ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) let(:book) do ======= resources :books, only: %i[show index] >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> bf137e4 (Manifest_cache true) RSpec.describe BookDecorator do ======= resources :books, only: %i[show index] >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) resources :books, only: %i[show index] >>>>>>> 4e81ea2 (Featire specs) ======= let(:book) do >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> 5a2009f (Fix) ======= >>>>>>> ae884b4 (Fix) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= ======= RSpec.describe BookDecorator do
  5. 3 <<<<<<< HEAD let(:book_decorator) { described_class.new(book) } ======= subject(:book_decorator) { described_class.new(book) } >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true)
  6. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs)
  7. 3 <<<<<<< HEAD let(:book_decorator) { described_class.new(book) } ======= subject(:book_decorator) { described_class.new(book) } >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> d8dd3b4 (Featire specs)
  8. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  9. 3 <<<<<<< HEAD let(:book_decorator) { described_class.new(book) } ======= subject(:book_decorator) { described_class.new(book) } >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true)
  10. <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> ae884b4 (Fix) ======= >>>>>>> f136376 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> 5507b42 (Featire specs) >>>>>>> 932dbec (Featire specs) >>>>>>> f136376 (Featire specs)
  11. 3 create(:book, price_cents: 123, authors: authors, categories: categories,
  12. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) >>>>>>> 5a2009f (Fix) <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 307f31f (Manifest_cache true) =======
  13. >>>>>>> ae2a012 (Manifest_cache true) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> ae884b4 (Fix) ======= >>>>>>> 2179316 (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= ======= =======
  14. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) >>>>>>> 2179316 (Manifest_cache true) <<<<<<< HEAD categories_count: 0, ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD categories_count: 0, ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> bf137e4 (Manifest_cache true) categories_count: 0, ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD categories_count: 0, ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= ======= categories_count: 0, >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= categories_count: 0, >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> ae884b4 (Fix) ======= >>>>>>> 0341d6d (Manifest_cache true) ======= categories_count: 0, >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= ======= ======= categories_count: 0, ======= =======
  15. <<<<<<< HEAD
  16. =======
  17. >>>>>>> ae2a012 (Manifest_cache true) 1 >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) let(:authors) do >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) >>>>>>> 0341d6d (Manifest_cache true)
  18. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 67ab529 (Fix) ======= >>>>>>> 8480924 (Featire specs) <<<<<<< HEAD
  19. =======
  20. >>>>>>> ae2a012 (Manifest_cache true) 1 >>>>>>> 7375d4b (Manifest_cache true) let(:authors) do >>>>>>> 02a399d (Manifest_cache true) ======= let(:authors) do >>>>>>> bd8bda4 (Manifest_cache true) ======= let(:authors) do >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD ======= let(:authors) do >>>>>>> 183b6c5 (Manifest_cache true) ======= let(:authors) do >>>>>>> fd6db03 (Manifest_cache true) ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 251144b (Manifest_cache true)
  21. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 251144b (Manifest_cache true) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= ======= >>>>>>> 251144b (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> fd6db03 (Manifest_cache true) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> ae884b4 (Fix) ======= >>>>>>> 2179316 (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> bf137e4 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) >>>>>>> 2179316 (Manifest_cache true)
  22. <<<<<<< HEAD authors_count: 0) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD authors_count: 0) ======= ======= authors_count: 0) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 845dac1 (Manifest_cache true) authors_count: 0) ======= >>>>>>> c8da2e3 (Fix) [ >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD ======= [ >>>>>>> bd8bda4 (Manifest_cache true) ======= [ >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= ======= >>>>>>> 251144b (Manifest_cache true) ======= [ >>>>>>> 183b6c5 (Manifest_cache true) ======= [ >>>>>>> fd6db03 (Manifest_cache true) ======= authors_count: 0) >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= authors_count: 0) >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> ae884b4 (Fix) ======= >>>>>>> 0341d6d (Manifest_cache true) ======= authors_count: 0) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) >>>>>>> 0341d6d (Manifest_cache true)
  23. ======= >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 5a2009f (Fix)
  24. <<<<<<< HEAD ======= =======
  25. 2 >>>>>>> 02a399d (Manifest_cache true) =======
  26. 2 >>>>>>> bd8bda4 (Manifest_cache true) =======
  27. 2 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= =======
  28. 2 >>>>>>> 183b6c5 (Manifest_cache true) =======
  29. 2 >>>>>>> fd6db03 (Manifest_cache true) =======
  30. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= =======
  31. >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> b28889f (Fix)
  32. <<<<<<< HEAD ======= =======
  33. 2 >>>>>>> 02a399d (Manifest_cache true) =======
  34. 2 >>>>>>> bd8bda4 (Manifest_cache true) =======
  35. 2 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD =======
  36. 2 >>>>>>> 183b6c5 (Manifest_cache true) =======
  37. 2 >>>>>>> fd6db03 (Manifest_cache true) =======
  38. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= =======
  39. =======
  40. >>>>>>> ae2a012 (Manifest_cache true) =======
  41. 2 >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) >>>>>>> 0341d6d (Manifest_cache true) <<<<<<< HEAD end ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= ======= end ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 845dac1 (Manifest_cache true) end ======= >>>>>>> c8da2e3 (Fix) FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'), >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD ======= FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'), >>>>>>> bd8bda4 (Manifest_cache true) ======= FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'), >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= ======= >>>>>>> 251144b (Manifest_cache true) ======= FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'), >>>>>>> 183b6c5 (Manifest_cache true) ======= FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'), >>>>>>> fd6db03 (Manifest_cache true) ======= end >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= end >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> ae884b4 (Fix) ======= >>>>>>> 0341d6d (Manifest_cache true) ======= end >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) >>>>>>> 0341d6d (Manifest_cache true)
  42. <<<<<<< HEAD
  43. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  44. 1 ======= =======
  45. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true)
  46. 1 ======= >>>>>>> c8da2e3 (Fix)
  47. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) =======
  48. =======
  49. >>>>>>> ae2a012 (Manifest_cache true) 2 >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD =======
  50. >>>>>>> bd8bda4 (Manifest_cache true) =======
  51. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= ======= >>>>>>> 251144b (Manifest_cache true) =======
  52. >>>>>>> 183b6c5 (Manifest_cache true) =======
  53. >>>>>>> fd6db03 (Manifest_cache true) =======
  54. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> 5a2009f (Fix) ======= >>>>>>> ae884b4 (Fix) ======= >>>>>>> 0341d6d (Manifest_cache true) =======
  55. 1 >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6d (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) >>>>>>> 2179316 (Manifest_cache true) <<<<<<< HEAD let(:authors) do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD let(:authors) do ======= ======= let(:authors) do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 845dac1 (Manifest_cache true) let(:authors) do ======= >>>>>>> c8da2e3 (Fix) FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk') >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD ======= FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk') >>>>>>> bd8bda4 (Manifest_cache true) ======= FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk') >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= ======= >>>>>>> 251144b (Manifest_cache true) ======= FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk') >>>>>>> 183b6c5 (Manifest_cache true) ======= FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk') >>>>>>> fd6db03 (Manifest_cache true) ======= let(:authors) do >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= let(:authors) do >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> ae884b4 (Fix) ======= >>>>>>> 0341d6d (Manifest_cache true) ======= let(:authors) do >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) >>>>>>> 0341d6d (Manifest_cache true)
  56. <<<<<<< HEAD
  57. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  58. ======= =======
  59. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true)
  60. ======= >>>>>>> c8da2e3 (Fix)
  61. >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD =======
  62. >>>>>>> bd8bda4 (Manifest_cache true) =======
  63. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= ======= >>>>>>> 251144b (Manifest_cache true) =======
  64. >>>>>>> 183b6c5 (Manifest_cache true) =======
  65. >>>>>>> fd6db03 (Manifest_cache true) =======
  66. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= =======
  67. >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> ae884b4 (Fix) ======= >>>>>>> 2179316 (Manifest_cache true) =======
  68. >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> bf137e4 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) >>>>>>> 2179316 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 0341d6d (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) >>>>>>> 0341d6d (Manifest_cache true) [
  69. <<<<<<< HEAD
  70. 3 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true)
  71. 3 ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD
  72. 3 ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix)
  73. =======
  74. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD =======
  75. 3 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> 5a2009f (Fix) ======= >>>>>>> ae884b4 (Fix) ======= >>>>>>> 2179316 (Manifest_cache true) =======
  76. 3 >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) >>>>>>> 2179316 (Manifest_cache true) create(:author, first_name: FFaker::Name.first_name, last_name: FFaker::Name.last_name),
  77. <<<<<<< HEAD
  78. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  79. ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true)
  80. ======= <<<<<<< HEAD <<<<<<< HEAD
  81. ======= >>>>>>> c8da2e3 (Fix)
  82. >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD =======
  83. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= =======
  84. >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> ae884b4 (Fix) ======= >>>>>>> 2179316 (Manifest_cache true) =======
  85. >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) >>>>>>> 2179316 (Manifest_cache true) create(:author, first_name: FFaker::Name.first_name, last_name: FFaker::Name.last_name)
  86. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 67ab529 (Fix) ======= >>>>>>> 8480924 (Featire specs) ======= >>>>>>> 0341d6d (Manifest_cache true) ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= ======= >>>>>>> 251144b (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> fd6db03 (Manifest_cache true) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> ae884b4 (Fix) ======= >>>>>>> 0341d6d (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) >>>>>>> 0341d6d (Manifest_cache true) ]
  87. <<<<<<< HEAD
  88. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  89. ======= =======
  90. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 845dac1 (Manifest_cache true)
  91. ======= >>>>>>> c8da2e3 (Fix)
  92. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD =======
  93. >>>>>>> bd8bda4 (Manifest_cache true) =======
  94. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= ======= >>>>>>> 251144b (Manifest_cache true) =======
  95. >>>>>>> 183b6c5 (Manifest_cache true) =======
  96. >>>>>>> fd6db03 (Manifest_cache true) =======
  97. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= =======
  98. >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> ae884b4 (Fix) ======= >>>>>>> 0341d6d (Manifest_cache true) =======
  99. >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) >>>>>>> 0341d6d (Manifest_cache true) end
  100. <<<<<<< HEAD
  101. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  102. ======= =======
  103. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  104. >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true)
  105. ======= >>>>>>> c8da2e3 (Fix)
  106. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) =======
  107. =======
  108. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD =======
  109. >>>>>>> bd8bda4 (Manifest_cache true) =======
  110. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= ======= >>>>>>> 251144b (Manifest_cache true) =======
  111. >>>>>>> 183b6c5 (Manifest_cache true) =======
  112. >>>>>>> fd6db03 (Manifest_cache true) =======
  113. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= =======
  114. >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> ae884b4 (Fix) ======= >>>>>>> 0341d6d (Manifest_cache true) =======
  115. >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6d (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) >>>>>>> 2179316 (Manifest_cache true) 1 let(:categories) do
  116. <<<<<<< HEAD
  117. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  118. ======= =======
  119. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true)
  120. ======= >>>>>>> c8da2e3 (Fix)
  121. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) =======
  122. =======
  123. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD =======
  124. >>>>>>> bd8bda4 (Manifest_cache true) =======
  125. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= ======= >>>>>>> 251144b (Manifest_cache true) =======
  126. >>>>>>> 183b6c5 (Manifest_cache true) =======
  127. >>>>>>> fd6db03 (Manifest_cache true) =======
  128. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= =======
  129. >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> ae884b4 (Fix) ======= >>>>>>> 0341d6d (Manifest_cache true) =======
  130. >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6d (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) >>>>>>> 2179316 (Manifest_cache true) [
  131. <<<<<<< HEAD
  132. 3 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  133. 3 ======= =======
  134. 3 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true)
  135. 3 ======= >>>>>>> c8da2e3 (Fix)
  136. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) =======
  137. =======
  138. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) 2 >>>>>>> 02a399d (Manifest_cache true) =======
  139. 2 >>>>>>> bd8bda4 (Manifest_cache true) =======
  140. 2 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= ======= >>>>>>> 251144b (Manifest_cache true) =======
  141. 2 >>>>>>> 183b6c5 (Manifest_cache true) =======
  142. 2 >>>>>>> fd6db03 (Manifest_cache true) =======
  143. 3 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> 5a2009f (Fix) ======= >>>>>>> ae884b4 (Fix) ======= >>>>>>> 0341d6d (Manifest_cache true) =======
  144. 3 >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= ======= 2 >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) >>>>>>> 0341d6d (Manifest_cache true) <<<<<<< HEAD create(:category, name: FFaker::Book.genre), ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD create(:category, name: FFaker::Book.genre), ======= ======= create(:category, name: FFaker::Book.genre), ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 845dac1 (Manifest_cache true) create(:category, name: FFaker::Book.genre), ======= >>>>>>> c8da2e3 (Fix) FactoryBot.create(:category, name: 'Poetry'), >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD ======= FactoryBot.create(:category, name: 'Poetry'), >>>>>>> bd8bda4 (Manifest_cache true) ======= FactoryBot.create(:category, name: 'Poetry'), >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= ======= >>>>>>> 251144b (Manifest_cache true) ======= FactoryBot.create(:category, name: 'Poetry'), >>>>>>> 183b6c5 (Manifest_cache true) ======= FactoryBot.create(:category, name: 'Poetry'), >>>>>>> fd6db03 (Manifest_cache true) ======= create(:category, name: FFaker::Book.genre), >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= create(:category, name: FFaker::Book.genre), >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> ae884b4 (Fix) ======= >>>>>>> 0341d6d (Manifest_cache true) ======= create(:category, name: FFaker::Book.genre), >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) >>>>>>> 0341d6d (Manifest_cache true)
  145. <<<<<<< HEAD
  146. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  147. ======= =======
  148. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true)
  149. ======= >>>>>>> c8da2e3 (Fix)
  150. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) =======
  151. =======
  152. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD =======
  153. >>>>>>> bd8bda4 (Manifest_cache true) =======
  154. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= ======= >>>>>>> 251144b (Manifest_cache true) =======
  155. >>>>>>> 183b6c5 (Manifest_cache true) =======
  156. >>>>>>> fd6db03 (Manifest_cache true) =======
  157. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= =======
  158. >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> ae884b4 (Fix) ======= >>>>>>> 0341d6d (Manifest_cache true) =======
  159. >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6d (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) >>>>>>> 2179316 (Manifest_cache true) <<<<<<< HEAD create(:category, name: FFaker::Book.genre) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD create(:category, name: FFaker::Book.genre) ======= ======= create(:category, name: FFaker::Book.genre) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 845dac1 (Manifest_cache true) create(:category, name: FFaker::Book.genre) ======= >>>>>>> c8da2e3 (Fix) FactoryBot.create(:category, name: 'Novel') >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> bd8bda4 (Manifest_cache true) ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= ======= >>>>>>> 251144b (Manifest_cache true) ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> 183b6c5 (Manifest_cache true) ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> fd6db03 (Manifest_cache true) ======= create(:category, name: FFaker::Book.genre) >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= create(:category, name: FFaker::Book.genre) >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> ae884b4 (Fix) ======= >>>>>>> 0341d6d (Manifest_cache true) ======= create(:category, name: FFaker::Book.genre) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) >>>>>>> 0341d6d (Manifest_cache true)
  160. <<<<<<< HEAD
  161. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  162. ======= =======
  163. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true)
  164. ======= >>>>>>> c8da2e3 (Fix)
  165. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) =======
  166. =======
  167. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD =======
  168. >>>>>>> bd8bda4 (Manifest_cache true) =======
  169. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= ======= >>>>>>> 251144b (Manifest_cache true) =======
  170. >>>>>>> 183b6c5 (Manifest_cache true) =======
  171. >>>>>>> fd6db03 (Manifest_cache true) =======
  172. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= =======
  173. >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> ae884b4 (Fix) ======= >>>>>>> 0341d6d (Manifest_cache true) =======
  174. >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6d (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) >>>>>>> 2179316 (Manifest_cache true) ]
  175. <<<<<<< HEAD
  176. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  177. ======= =======
  178. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true)
  179. ======= >>>>>>> c8da2e3 (Fix)
  180. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) =======
  181. =======
  182. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD =======
  183. >>>>>>> bd8bda4 (Manifest_cache true) =======
  184. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= ======= >>>>>>> 251144b (Manifest_cache true) =======
  185. >>>>>>> 183b6c5 (Manifest_cache true) =======
  186. >>>>>>> fd6db03 (Manifest_cache true) =======
  187. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= =======
  188. >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> ae884b4 (Fix) ======= >>>>>>> 0341d6d (Manifest_cache true) =======
  189. >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6d (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) >>>>>>> 2179316 (Manifest_cache true) end
  190. <<<<<<< HEAD
  191. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  192. ======= =======
  193. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true)
  194. ======= >>>>>>> c8da2e3 (Fix) >>>>>>> 7375d4b (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> fd6db03 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= =======
  195. ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6d (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> 2179316 (Manifest_cache true)
  196. 3 let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
  197. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 251144b (Manifest_cache true) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 2179316 (Manifest_cache true)
  198. >>>>>>> 02a399d (Manifest_cache true) =======
  199. >>>>>>> bd8bda4 (Manifest_cache true) =======
  200. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= ======= >>>>>>> 251144b (Manifest_cache true) =======
  201. >>>>>>> 183b6c5 (Manifest_cache true) =======
  202. >>>>>>> fd6db03 (Manifest_cache true) =======
  203. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= =======
  204. >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> ae884b4 (Fix) ======= >>>>>>> 0341d6d (Manifest_cache true) =======
  205. >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= =======
  206. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) >>>>>>> 0341d6d (Manifest_cache true)
  207. <<<<<<< HEAD
  208. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  209. ======= =======
  210. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 845dac1 (Manifest_cache true)
  211. ======= >>>>>>> c8da2e3 (Fix)
  212. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD =======
  213. >>>>>>> bd8bda4 (Manifest_cache true) =======
  214. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= ======= >>>>>>> 251144b (Manifest_cache true) =======
  215. >>>>>>> 183b6c5 (Manifest_cache true) =======
  216. >>>>>>> fd6db03 (Manifest_cache true) =======
  217. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= =======
  218. >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> ae884b4 (Fix) ======= >>>>>>> 0341d6d (Manifest_cache true) =======
  219. >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) >>>>>>> 0341d6d (Manifest_cache true) 1 <<<<<<< HEAD describe '#categories_names' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD describe '#categories_names' do ======= ======= describe '#categories_names' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) describe '#categories_names' do ======= >>>>>>> c8da2e3 (Fix) it '#authors_names' do >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= context 'when decorate' do ======= it '#authors_names' do >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= it '#authors_names' do >>>>>>> bd8bda4 (Manifest_cache true) ======= it '#authors_names' do >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= ======= >>>>>>> 251144b (Manifest_cache true) ======= it '#authors_names' do >>>>>>> 183b6c5 (Manifest_cache true) ======= context 'when decorate' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it '#authors_names' do >>>>>>> fd6db03 (Manifest_cache true) ======= describe '#categories_names' do >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= describe '#categories_names' do >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> ae884b4 (Fix) ======= >>>>>>> 0341d6d (Manifest_cache true) ======= describe '#categories_names' do >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6d (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) >>>>>>> 2179316 (Manifest_cache true)
  220. <<<<<<< HEAD
  221. 2 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  222. 2 ======= =======
  223. 2 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 845dac1 (Manifest_cache true)
  224. 2 ======= >>>>>>> c8da2e3 (Fix)
  225. 1 >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD =======
  226. 1 >>>>>>> bd8bda4 (Manifest_cache true) =======
  227. 1 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= ======= >>>>>>> 251144b (Manifest_cache true) =======
  228. 1 >>>>>>> 183b6c5 (Manifest_cache true) =======
  229. 1 >>>>>>> fd6db03 (Manifest_cache true) =======
  230. 2 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> 5a2009f (Fix) ======= >>>>>>> ae884b4 (Fix) ======= >>>>>>> 0341d6d (Manifest_cache true) =======
  231. 2 >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) >>>>>>> 0341d6d (Manifest_cache true) <<<<<<< HEAD it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") } ======= ======= it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") } ======= >>>>>>> c8da2e3 (Fix) expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= it '#authors_names' do ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> bd8bda4 (Manifest_cache true) ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= ======= >>>>>>> 251144b (Manifest_cache true) ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> 183b6c5 (Manifest_cache true) ======= it '#authors_names' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> fd6db03 (Manifest_cache true) ======= it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") } >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") } >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> ae884b4 (Fix) ======= >>>>>>> 0341d6d (Manifest_cache true) ======= it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") } >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6d (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) >>>>>>> 2179316 (Manifest_cache true)
  232. <<<<<<< HEAD <<<<<<< HEAD
  233. ======= ======= <<<<<<< HEAD =======
  234. ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  235. 1 <<<<<<< HEAD ======= =======
  236. =======
  237. =======
  238. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6d (Manifest_cache true) ======= =======
  239. 1 >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 2179316 (Manifest_cache true) <<<<<<< HEAD expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') ======= <<<<<<< HEAD <<<<<<< HEAD expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') ======= end >>>>>>> fd6db03 (Manifest_cache true) ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 2179316 (Manifest_cache true)
  240. <<<<<<< HEAD <<<<<<< HEAD
  241. ======= <<<<<<< HEAD
  242. =======
  243. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) =======
  244. >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 2179316 (Manifest_cache true) end >>>>>>> 7375d4b (Manifest_cache true)
  245. <<<<<<< HEAD
  246. <<<<<<< HEAD =======
  247. >>>>>>> 02a399d (Manifest_cache true) ======= <<<<<<< HEAD =======
  248. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  249. >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= =======
  250. 1 it '#categories_names' do
  251. 1 expect(book_decorator.categories_names).to eq('Poetry, Novel')
  252. end
  253. =======
  254. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> 557c1b8 (Fix) >>>>>>> ae884b4 (Fix) end ======= >>>>>>> c8da2e3 (Fix) >>>>>>> 5a2009f (Fix) <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 67ab529 (Fix) ======= end >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= end >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix)
  255. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> bf137e4 (Manifest_cache true)
  256. ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= >>>>>>> 8480924 (Featire specs)
  257. 1 =======
  258. =======
  259. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) it '#categories_names' do
  260. <<<<<<< HEAD
  261. =======
  262. >>>>>>> 02a399d (Manifest_cache true) 1 <<<<<<< HEAD expect(book_decorator.categories_names).to eq('Poetry, Novel') ======= <<<<<<< HEAD describe '#authors_names' do ======= it '#categories_names' do >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true)
  263. <<<<<<< HEAD
  264. end
  265. =======
  266. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) =======
  267. >>>>>>> bd8bda4 (Manifest_cache true) =======
  268. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 490b01d (Manifest_cache true) end
  269. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true)
  270. =======
  271. >>>>>>> 02a399d (Manifest_cache true) =======
  272. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= =======
  273. >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> ae884b4 (Fix) =======
  274. >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) >>>>>>> ae884b4 (Fix)
  275. <<<<<<< HEAD
  276. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 557c1b8 (Fix)
  277. ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD
  278. =======
  279. >>>>>>> 02a399d (Manifest_cache true) =======
  280. >>>>>>> fd6db03 (Manifest_cache true) =======
  281. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= =======
  282. >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> ae884b4 (Fix) ======= >>>>>>> 0341d6d (Manifest_cache true) =======
  283. >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= ======= <<<<<<< HEAD
  284. =======
  285. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) >>>>>>> 0341d6d (Manifest_cache true) 1 <<<<<<< HEAD describe '#authors_names' do ======= <<<<<<< HEAD <<<<<<< HEAD ======= describe '#authors_names' do ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD describe '#authors_names' do ======= it '#categories_names' do >>>>>>> 02a399d (Manifest_cache true) ======= it '#categories_names' do >>>>>>> fd6db03 (Manifest_cache true) ======= describe '#authors_names' do >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= describe '#authors_names' do >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> ae884b4 (Fix) ======= >>>>>>> 0341d6d (Manifest_cache true) ======= describe '#authors_names' do >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= ======= it { ======= expect(book_decorator.categories_names).to eq('Poetry, Novel') >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) >>>>>>> 0341d6d (Manifest_cache true)
  286. <<<<<<< HEAD
  287. ======= <<<<<<< HEAD <<<<<<< HEAD =======
  288. ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  289. =======
  290. >>>>>>> 02a399d (Manifest_cache true) =======
  291. >>>>>>> fd6db03 (Manifest_cache true) =======
  292. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= =======
  293. >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> ae884b4 (Fix) =======
  294. >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) >>>>>>> ae884b4 (Fix) 1 <<<<<<< HEAD it { ======= <<<<<<< HEAD <<<<<<< HEAD ======= it { ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it { ======= expect(book_decorator.categories_names).to eq('Poetry, Novel') >>>>>>> 02a399d (Manifest_cache true) ======= expect(book_decorator.categories_names).to eq('Poetry, Novel') >>>>>>> fd6db03 (Manifest_cache true) ======= it { >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= it { >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> ae884b4 (Fix) ======= it { >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) >>>>>>> ae884b4 (Fix)
  295. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 0341d6d (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) >>>>>>> 0341d6d (Manifest_cache true)
  296. 1 expect(decorated_object.authors_names).to eq("#{authors.first.first_name} #{authors.first.last_name}, " \
  297. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 67ab529 (Fix)
  298. <<<<<<< HEAD ======= ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> bf137e4 (Manifest_cache true)
  299. ======= <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> 7375d4b (Manifest_cache true)
  300. ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2179316 (Manifest_cache true) ======= ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) >>>>>>> d245196 (Manifest_cache true)
  301. <<<<<<< HEAD ======= <<<<<<< HEAD end
  302. ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 2179316 (Manifest_cache true)
  303. <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 2179316 (Manifest_cache true)
  304. 1 it '#categories_names' do
  305. <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 2179316 (Manifest_cache true)
  306. 1 <<<<<<< HEAD expect(book_decorator.categories_names).to eq('Poetry, Novel') ======= <<<<<<< HEAD it '#categories_names' do ======= expect(book_decorator.categories_names).to eq('Poetry, Novel') >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 2179316 (Manifest_cache true)
  307. <<<<<<< HEAD <<<<<<< HEAD
  308. ======= ======= >>>>>>> 2179316 (Manifest_cache true)
  309. 1 expect(book_decorator.categories_names).to eq('Poetry, Novel')
  310. end
  311. <<<<<<< HEAD <<<<<<< HEAD ======= =======
  312. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) =======
  313. >>>>>>> bd8bda4 (Manifest_cache true) =======
  314. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= ======= =======
  315. >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> 2179316 (Manifest_cache true) end
  316. <<<<<<< HEAD
  317. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD
  318. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  319. =======
  320. >>>>>>> 02a399d (Manifest_cache true)
  321. <<<<<<< HEAD
  322. =======
  323. >>>>>>> 02a399d (Manifest_cache true) 1 <<<<<<< HEAD describe '#authors_names' do ======= it '#categories_names' do >>>>>>> 02a399d (Manifest_cache true)
  324. <<<<<<< HEAD
  325. =======
  326. >>>>>>> 02a399d (Manifest_cache true) 1 <<<<<<< HEAD it { ======= expect(book_decorator.categories_names).to eq('Poetry, Novel') >>>>>>> 02a399d (Manifest_cache true)
  327. <<<<<<< HEAD
  328. 1 expect(decorated_object.authors_names).to eq("#{authors.first.first_name} #{authors.first.last_name}, " \
  329. ======= >>>>>>> 7375d4b (Manifest_cache true)
  330. ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true)
  331. 1 it '#categories_names' do
  332. 1 expect(book_decorator.categories_names).to eq('Poetry, Novel')
  333. end
  334. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 251144b (Manifest_cache true) >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= =======
  335. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= =======
  336. >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> ae884b4 (Fix) ======= >>>>>>> 2179316 (Manifest_cache true) =======
  337. >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= =======
  338. <<<<<<< HEAD >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) >>>>>>> 2179316 (Manifest_cache true) "#{authors.last.first_name} #{authors.last.last_name}")
  339. }
  340. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) >>>>>>> 5a2009f (Fix) <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> e9f3851 (Manifest_cache true) =======
  341. >>>>>>> 02a399d (Manifest_cache true) =======
  342. >>>>>>> fd6db03 (Manifest_cache true) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> ae884b4 (Fix) ======= >>>>>>> 0341d6d (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= ======= =======
  343. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) >>>>>>> 0341d6d (Manifest_cache true) end
  344. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 0341d6d (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) >>>>>>> 0341d6d (Manifest_cache true)
  345. 1 describe '#price' do
  346. 2 it { expect(decorated_object.price).to eq(1.23.to_money) }
  347. end
  348. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 67ab529 (Fix) ======= >>>>>>> 8480924 (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> 5a2009f (Fix) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 5507b42 (Featire specs) =======
  349. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) =======
  350. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD =======
  351. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bd8bda4 (Manifest_cache true) =======
  352. >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) =======
  353. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  354. >>>>>>> fd6db03 (Manifest_cache true) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= =======
  355. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD =======
  356. >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 183b6c5 (Manifest_cache true) =======
  357. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  358. >>>>>>> fd6db03 (Manifest_cache true) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) ======= =======
  359. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6d (Manifest_cache true) ======= ======= ======= ======= =======
  360. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0e (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> d245196 (Manifest_cache true) end
<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 75fa7e1 (Rebased) ======= ======= >>>>>>> 8480924 (Featire specs) ======= >>>>>>> d8dd3b4 (Featire specs) ======= >>>>>>> 5a2009f (Fix) ======= >>>>>>> 4f4ea3f (Featire specs) ======= >>>>>>> 365d41e (Featire specs) ======= >>>>>>> c05ee51 (Featire specs) ======= >>>>>>> 251144b (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6d (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0e (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> d245196 (Manifest_cache true)

spec/factories/addresses.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 FactoryBot.define do
  2. 1 factory :address do
  3. end
  4. end

spec/factories/admin_users.rb

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= ======= ======= >>>>>>> 8480924 (Featire specs)

spec/factories/authors.rb

>>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD =======

spec/factories/authors.rb

>>>>>>> 752f0c0 (Featire specs) =======

spec/factories/authors.rb

>>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= >>>>>>> 13fca83 (Rebased) ======= >>>>>>> f136376 (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> d782a28 (Manifest_cache true)

spec/factories/authors.rb

<<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= =======

spec/factories/authors.rb

>>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509ee (Featire specs) ======= >>>>>>> 75fa7e1 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) =======

spec/factories/authors.rb

>>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 77d62af (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= =======

spec/factories/authors.rb

>>>>>>> 4e81ea2 (Featire specs) =======

spec/factories/authors.rb

>>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= =======

spec/factories/authors.rb

>>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs)

100.0% lines covered

4 relevant lines. 4 lines covered and 0 lines missed.
    
  1. 1 FactoryBot.define do
  2. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41e (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> 13fca83 (Rebased) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 1ca9c0e (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 1ca9c0e (Featire specs) factory :admin_user do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= factory :admin_user do ======= <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) factory :admin_user do ======= factory :author do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= factory :author do >>>>>>> 752f0c0 (Featire specs) ======= factory :author do >>>>>>> 4e81ea2 (Featire specs) ======= factory :author do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= factory :author do >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509ee (Featire specs) ======= factory :admin_user do >>>>>>> 75fa7e1 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 365d41e (Featire specs) ======= >>>>>>> c05ee51 (Featire specs) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 1ca9c0e (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= factory :author do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= factory :author do >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= factory :author do <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= factory :author do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= factory :author do >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= factory :admin_user do >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= factory :author do >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs)
  3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  4. 13 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  5. 13 =======
  6. 1 >>>>>>> d0dc1f1 (Featire specs) =======
  7. 1 >>>>>>> 752f0c0 (Featire specs) =======
  8. 1 >>>>>>> 4e81ea2 (Featire specs) =======
  9. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= =======
  10. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509ee (Featire specs) =======
  11. 1 >>>>>>> 75fa7e1 (Rebased) =======
  12. 15 >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> d8dd3b4 (Featire specs) ======= >>>>>>> 5a2009f (Fix) ======= >>>>>>> 365d41e (Featire specs) ======= >>>>>>> c05ee51 (Featire specs) ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> 13fca83 (Rebased) ======= >>>>>>> ae884b4 (Fix) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 1ca9c0e (Featire specs)
  13. 15 ======= ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs)
  14. 13 =======
  15. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) =======
  16. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD
  17. 15 >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= =======
  18. 1 >>>>>>> 4e81ea2 (Featire specs) =======
  19. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= =======
  20. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= =======
  21. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= =======
  22. 15 >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= ======= >>>>>>> af057e3 (Featire specs)
  23. 15 =======
  24. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= =======
  25. 1 >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41e (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> 13fca83 (Rebased) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 1ca9c0e (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 1ca9c0e (Featire specs) email { FFaker::Internet.email } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= email { FFaker::Internet.email } ======= <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) email { FFaker::Internet.email } ======= first_name { FFaker::Name.first_name } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= first_name { FFaker::Name.first_name } >>>>>>> 752f0c0 (Featire specs) ======= first_name { FFaker::Name.first_name } >>>>>>> 4e81ea2 (Featire specs) ======= first_name { FFaker::Name.first_name } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= first_name { FFaker::Name.first_name } >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509ee (Featire specs) ======= email { FFaker::Internet.email } >>>>>>> 75fa7e1 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 365d41e (Featire specs) ======= >>>>>>> c05ee51 (Featire specs) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 1ca9c0e (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= first_name { FFaker::Name.first_name } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= first_name { FFaker::Name.first_name } >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= first_name { FFaker::Name.first_name } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= first_name { FFaker::Name.first_name } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= first_name { FFaker::Name.first_name } >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= email { FFaker::Internet.email } >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= first_name { FFaker::Name.first_name } >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs)
  26. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  27. 13 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  28. 13 =======
  29. 1 >>>>>>> d0dc1f1 (Featire specs) =======
  30. 1 >>>>>>> 752f0c0 (Featire specs) =======
  31. 1 >>>>>>> 4e81ea2 (Featire specs) =======
  32. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= =======
  33. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509ee (Featire specs) =======
  34. 1 >>>>>>> 75fa7e1 (Rebased) =======
  35. 15 >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> d8dd3b4 (Featire specs) ======= >>>>>>> 5a2009f (Fix) ======= >>>>>>> 365d41e (Featire specs) ======= >>>>>>> c05ee51 (Featire specs) ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> 13fca83 (Rebased) ======= >>>>>>> ae884b4 (Fix) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 1ca9c0e (Featire specs)
  36. 15 ======= ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs)
  37. 13 =======
  38. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) =======
  39. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD
  40. 15 >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= =======
  41. 1 >>>>>>> 4e81ea2 (Featire specs) =======
  42. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= =======
  43. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= =======
  44. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= =======
  45. 15 >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= ======= >>>>>>> af057e3 (Featire specs)
  46. 15 =======
  47. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= =======
  48. 1 >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41e (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> 13fca83 (Rebased) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 1ca9c0e (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 1ca9c0e (Featire specs) password { 'adminPassword' } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= password { 'adminPassword' } ======= <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) password { 'adminPassword' } ======= last_name { FFaker::Name.last_name } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= last_name { FFaker::Name.last_name } >>>>>>> 752f0c0 (Featire specs) ======= last_name { FFaker::Name.last_name } >>>>>>> 4e81ea2 (Featire specs) ======= last_name { FFaker::Name.last_name } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= last_name { FFaker::Name.last_name } >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509ee (Featire specs) ======= password { 'adminPassword' } >>>>>>> 75fa7e1 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 365d41e (Featire specs) ======= >>>>>>> c05ee51 (Featire specs) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 1ca9c0e (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= last_name { FFaker::Name.last_name } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= last_name { FFaker::Name.last_name } >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= last_name { FFaker::Name.last_name } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= last_name { FFaker::Name.last_name } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= last_name { FFaker::Name.last_name } >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= password { 'adminPassword' } >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= last_name { FFaker::Name.last_name } >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs)
  49. end
  50. end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= >>>>>>> 34509ee (Featire specs) ======= >>>>>>> 75fa7e1 (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 365d41e (Featire specs) ======= >>>>>>> c05ee51 (Featire specs) ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> 13fca83 (Rebased) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 1ca9c0e (Featire specs) ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs)

spec/factories/authors.rb

80.0% lines covered

10 relevant lines. 8 lines covered and 2 lines missed.
    
  1. 1 FactoryBot.define do
  2. 1 factory :author do
  3. 5 first_name { FFaker::Name.first_name }
  4. 5 last_name { FFaker::Name.last_name }
  5. 1 transient do
  6. 1 books_count { 1 }
  7. end
  8. 1 after :create do |author, books_count|
  9. 10 author.books do
  10. Array.new(books_count) do
  11. association(:author, books: [instance])
  12. end
  13. end
  14. end
  15. end
  16. end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509ee (Featire specs) ======= >>>>>>> 75fa7e1 (Rebased) ======= ======= >>>>>>> 13fca83 (Rebased) ======= >>>>>>> f136376 (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs)

spec/factories/authors_books.rb

100.0% lines covered

4 relevant lines. 4 lines covered and 0 lines missed.
    
  1. 1 FactoryBot.define do
  2. 1 factory :authors_book do
  3. 1 author
  4. 1 book
  5. end
  6. end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8480924 (Featire specs) ======= >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41e (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> 13fca83 (Rebased) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 1ca9c0e (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 1ca9c0e (Featire specs)

spec/factories/billings.rb

======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8480924 (Featire specs)

spec/factories/billings.rb

=======

spec/factories/books.rb

>>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======

spec/factories/books.rb

>>>>>>> 752f0c0 (Featire specs) =======

spec/factories/books.rb

>>>>>>> 4e81ea2 (Featire specs) =======

spec/factories/books.rb

>>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= =======

spec/factories/books.rb

>>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509ee (Featire specs) =======

spec/factories/billings.rb

>>>>>>> 75fa7e1 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 365d41e (Featire specs) ======= >>>>>>> c05ee51 (Featire specs) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 1ca9c0e (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) =======

spec/factories/books.rb

>>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 77d62af (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= =======

spec/factories/books.rb

>>>>>>> 4e81ea2 (Featire specs) =======

spec/factories/books.rb

>>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= =======

spec/factories/books.rb

>>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= =======

spec/factories/billings.rb

>>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs)

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8480924 (Featire specs) ======= >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41e (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> 13fca83 (Rebased) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 1ca9c0e (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 1ca9c0e (Featire specs) 8 relevant lines. 8 lines covered and ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8480924 (Featire specs) 8 relevant lines. 8 lines covered and ======= 9 relevant lines. 9 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= 9 relevant lines. 9 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509ee (Featire specs) ======= 8 relevant lines. 8 lines covered and >>>>>>> 75fa7e1 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 365d41e (Featire specs) ======= >>>>>>> c05ee51 (Featire specs) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 1ca9c0e (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 77d62af (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= 8 relevant lines. 8 lines covered and >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs) 0 lines missed.
    
  1. 1 FactoryBot.define do
  2. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= >>>>>>> 34509ee (Featire specs) ======= >>>>>>> 75fa7e1 (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 365d41e (Featire specs) ======= >>>>>>> c05ee51 (Featire specs) ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> 13fca83 (Rebased) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 1ca9c0e (Featire specs) ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs) factory :billing do
  3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4f4ea3f (Featire specs) ======= ======= >>>>>>> 13fca83 (Rebased) ======= >>>>>>> 0341d6d (Manifest_cache true) ======= >>>>>>> 2179316 (Manifest_cache true) ======= >>>>>>> d245196 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  4. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  5. 1 =======
  6. 3 >>>>>>> 02a399d (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
  7. 3 ======= <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs)
  8. 82 =======
  9. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD ======= =======
  10. 80 >>>>>>> 752f0c0 (Featire specs) >>>>>>> 4f4ea3f (Featire specs) =======
  11. 3 >>>>>>> bd8bda4 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD
  12. 3 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= =======
  13. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
  14. 82 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  15. 3 >>>>>>> fd6db03 (Manifest_cache true) =======
  16. 82 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) =======
  17. 1 >>>>>>> 75fa7e1 (Rebased) ======= ======= >>>>>>> 251144b (Manifest_cache true)
  18. 80 >>>>>>> 4e81ea2 (Featire specs) =======
  19. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
  20. 80 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= =======
  21. 3 <<<<<<< HEAD >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) =======
  22. 82 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= =======
  23. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> d782a28 (Manifest_cache true)
  24. 1 =======
  25. 3 >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6d (Manifest_cache true) ======= ======= =======
  26. 82 =======
  27. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2179316 (Manifest_cache true) ======= ======= =======
  28. 3 >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> d782a28 (Manifest_cache true) >>>>>>> d245196 (Manifest_cache true) user
  29. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4f4ea3f (Featire specs) ======= ======= >>>>>>> 13fca83 (Rebased) ======= >>>>>>> 0341d6d (Manifest_cache true) ======= >>>>>>> 2179316 (Manifest_cache true) ======= >>>>>>> d245196 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  30. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  31. 1 =======
  32. 3 >>>>>>> 02a399d (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
  33. 3 ======= <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs)
  34. 92 =======
  35. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD ======= =======
  36. 90 >>>>>>> 752f0c0 (Featire specs) >>>>>>> 4f4ea3f (Featire specs) =======
  37. 3 >>>>>>> bd8bda4 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD
  38. 3 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= =======
  39. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
  40. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  41. 3 >>>>>>> fd6db03 (Manifest_cache true) =======
  42. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) =======
  43. 1 >>>>>>> 75fa7e1 (Rebased) ======= ======= >>>>>>> 251144b (Manifest_cache true)
  44. 90 >>>>>>> 4e81ea2 (Featire specs) =======
  45. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
  46. 90 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= =======
  47. 3 <<<<<<< HEAD >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) =======
  48. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= =======
  49. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> d782a28 (Manifest_cache true)
  50. 1 =======
  51. 3 >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6d (Manifest_cache true) ======= ======= =======
  52. 92 =======
  53. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2179316 (Manifest_cache true) ======= ======= =======
  54. 3 >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> d782a28 (Manifest_cache true) >>>>>>> d245196 (Manifest_cache true) address { FFaker::AddressUA.street_address }
  55. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4f4ea3f (Featire specs) ======= ======= >>>>>>> 13fca83 (Rebased) ======= >>>>>>> 0341d6d (Manifest_cache true) ======= >>>>>>> 2179316 (Manifest_cache true) ======= >>>>>>> d245196 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  56. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  57. 1 =======
  58. 3 >>>>>>> 02a399d (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
  59. 3 ======= <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs)
  60. 82 =======
  61. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD ======= =======
  62. 80 >>>>>>> 752f0c0 (Featire specs) >>>>>>> 4f4ea3f (Featire specs) =======
  63. 3 >>>>>>> bd8bda4 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD
  64. 3 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= =======
  65. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
  66. 82 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  67. 3 >>>>>>> fd6db03 (Manifest_cache true) =======
  68. 82 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) =======
  69. 1 >>>>>>> 75fa7e1 (Rebased) ======= ======= >>>>>>> 251144b (Manifest_cache true)
  70. 80 >>>>>>> 4e81ea2 (Featire specs) =======
  71. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
  72. 80 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= =======
  73. 3 <<<<<<< HEAD >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) =======
  74. 82 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= =======
  75. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> d782a28 (Manifest_cache true)
  76. 1 =======
  77. 3 >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6d (Manifest_cache true) ======= ======= =======
  78. 82 =======
  79. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2179316 (Manifest_cache true) ======= ======= =======
  80. 3 >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> d782a28 (Manifest_cache true) >>>>>>> d245196 (Manifest_cache true) city { FFaker::AddressUA.city }
  81. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4f4ea3f (Featire specs) ======= ======= >>>>>>> 13fca83 (Rebased) ======= >>>>>>> 0341d6d (Manifest_cache true) ======= >>>>>>> 2179316 (Manifest_cache true) ======= >>>>>>> d245196 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  82. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  83. 1 =======
  84. 3 >>>>>>> 02a399d (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
  85. 3 ======= <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs)
  86. 92 =======
  87. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD ======= =======
  88. 90 >>>>>>> 752f0c0 (Featire specs) >>>>>>> 4f4ea3f (Featire specs) =======
  89. 3 >>>>>>> bd8bda4 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD
  90. 3 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= =======
  91. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
  92. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  93. 3 >>>>>>> fd6db03 (Manifest_cache true) =======
  94. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) =======
  95. 1 >>>>>>> 75fa7e1 (Rebased) ======= ======= >>>>>>> 251144b (Manifest_cache true)
  96. 90 >>>>>>> 4e81ea2 (Featire specs) =======
  97. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
  98. 90 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= =======
  99. 3 <<<<<<< HEAD >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) =======
  100. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= =======
  101. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> d782a28 (Manifest_cache true)
  102. 1 =======
  103. 3 >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6d (Manifest_cache true) ======= ======= =======
  104. 92 =======
  105. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2179316 (Manifest_cache true) ======= ======= =======
  106. 3 >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> d782a28 (Manifest_cache true) >>>>>>> d245196 (Manifest_cache true) zip { FFaker::AddressUA.zip_code }
  107. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4f4ea3f (Featire specs) ======= ======= >>>>>>> 13fca83 (Rebased) ======= >>>>>>> 0341d6d (Manifest_cache true) ======= >>>>>>> 2179316 (Manifest_cache true) ======= >>>>>>> d245196 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  108. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  109. 1 =======
  110. 3 >>>>>>> 02a399d (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
  111. 3 ======= <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs)
  112. 92 =======
  113. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD ======= =======
  114. 90 >>>>>>> 752f0c0 (Featire specs) >>>>>>> 4f4ea3f (Featire specs) =======
  115. 3 >>>>>>> bd8bda4 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD
  116. 3 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= =======
  117. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
  118. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  119. 3 >>>>>>> fd6db03 (Manifest_cache true) =======
  120. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) =======
  121. 1 >>>>>>> 75fa7e1 (Rebased) ======= ======= >>>>>>> 251144b (Manifest_cache true)
  122. 90 >>>>>>> 4e81ea2 (Featire specs) =======
  123. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
  124. 90 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= =======
  125. 3 <<<<<<< HEAD >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) =======
  126. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= =======
  127. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> d782a28 (Manifest_cache true)
  128. 1 =======
  129. 3 >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6d (Manifest_cache true) ======= ======= =======
  130. 92 =======
  131. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2179316 (Manifest_cache true) ======= ======= =======
  132. 3 >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> d782a28 (Manifest_cache true) >>>>>>> d245196 (Manifest_cache true) country { FFaker::AddressUA.country }
  133. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4f4ea3f (Featire specs) ======= ======= >>>>>>> 13fca83 (Rebased) ======= >>>>>>> 0341d6d (Manifest_cache true) ======= >>>>>>> 2179316 (Manifest_cache true) ======= >>>>>>> d245196 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  134. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  135. 1 =======
  136. 3 >>>>>>> 02a399d (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
  137. 3 ======= <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs)
  138. 92 =======
  139. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD ======= =======
  140. 90 >>>>>>> 752f0c0 (Featire specs) >>>>>>> 4f4ea3f (Featire specs) =======
  141. 3 >>>>>>> bd8bda4 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD
  142. 3 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= =======
  143. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
  144. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  145. 3 >>>>>>> fd6db03 (Manifest_cache true) =======
  146. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) =======
  147. 1 >>>>>>> 75fa7e1 (Rebased) ======= ======= >>>>>>> 251144b (Manifest_cache true)
  148. 90 >>>>>>> 4e81ea2 (Featire specs) =======
  149. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
  150. 90 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= =======
  151. 3 <<<<<<< HEAD >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) =======
  152. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= =======
  153. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> d782a28 (Manifest_cache true)
  154. 1 =======
  155. 3 >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6d (Manifest_cache true) ======= ======= =======
  156. 92 =======
  157. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2179316 (Manifest_cache true) ======= ======= =======
  158. 3 >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> d782a28 (Manifest_cache true) >>>>>>> d245196 (Manifest_cache true) phone { FFaker::PhoneNumberUA.home_phone_number }
  159. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4f4ea3f (Featire specs) ======= ======= >>>>>>> 13fca83 (Rebased) ======= >>>>>>> 0341d6d (Manifest_cache true) ======= >>>>>>> 2179316 (Manifest_cache true) ======= >>>>>>> d245196 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  160. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  161. =======
  162. 3 ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
  163. 3 ======= <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs)
  164. 92 =======
  165. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD ======= =======
  166. 90 >>>>>>> 752f0c0 (Featire specs) >>>>>>> 4f4ea3f (Featire specs) =======
  167. 3 >>>>>>> bd8bda4 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD
  168. 3 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD ======= =======
  169. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
  170. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  171. 3 >>>>>>> fd6db03 (Manifest_cache true) =======
  172. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 251144b (Manifest_cache true)
  173. 90 >>>>>>> 4e81ea2 (Featire specs) =======
  174. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
  175. 90 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= =======
  176. 3 <<<<<<< HEAD >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) =======
  177. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> d782a28 (Manifest_cache true)
  178. =======
  179. 3 <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6d (Manifest_cache true) ======= ======= =======
  180. 92 =======
  181. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2179316 (Manifest_cache true) ======= ======= =======
  182. 3 >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> d782a28 (Manifest_cache true) >>>>>>> d245196 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 307f31f (Manifest_cache true) >>>>>>> 2179316 (Manifest_cache true) quantity { FFaker::Number.rand(0..10) } ======= <<<<<<< HEAD quantity { FFaker::Number.rand(2..10) } ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD quantity { FFaker::Number.rand(2..10) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 752f0c0 (Featire specs) ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 4e81ea2 (Featire specs) ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6d (Manifest_cache true) ======= ======= >>>>>>> 307f31f (Manifest_cache true) >>>>>>> 2179316 (Manifest_cache true)
  183. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 490b01d (Manifest_cache true) =======
  184. >>>>>>> 75fa7e1 (Rebased) ======= ======= >>>>>>> 0341d6d (Manifest_cache true) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= =======
  185. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> 0341d6d (Manifest_cache true) end
  186. end

spec/factories/books.rb

80.95% lines covered

21 relevant lines. 17 lines covered and 4 lines missed.
    
  1. 1 FactoryBot.define do
  2. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509ee (Featire specs) ======= >>>>>>> 75fa7e1 (Rebased) ======= ======= >>>>>>> 13fca83 (Rebased) ======= >>>>>>> f136376 (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs) factory :book do
  3. <<<<<<< HEAD <<<<<<< HEAD
  4. 95 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 365d41e (Featire specs) ======= >>>>>>> c05ee51 (Featire specs) ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> 13fca83 (Rebased) ======= >>>>>>> ae884b4 (Fix) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 1ca9c0e (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> 5a2009f (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
  5. 3 ======= <<<<<<< HEAD
  6. 82 =======
  7. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
  8. 80 >>>>>>> 752f0c0 (Featire specs) =======
  9. 3 >>>>>>> bd8bda4 (Manifest_cache true) =======
  10. 80 >>>>>>> 4e81ea2 (Featire specs) =======
  11. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
  12. 80 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= =======
  13. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
  14. 82 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) =======
  15. 95 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs)
  16. 95 =======
  17. 80 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= =======
  18. 80 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= =======
  19. 80 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= =======
  20. 80 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= =======
  21. 80 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) =======
  22. 1 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) =======
  23. 97 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs)
  24. 97 =======
  25. 80 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= =======
  26. 80 >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs) title { FFaker::Book.title }
  27. <<<<<<< HEAD <<<<<<< HEAD
  28. 109 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 365d41e (Featire specs) ======= >>>>>>> c05ee51 (Featire specs) ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> 13fca83 (Rebased) ======= >>>>>>> ae884b4 (Fix) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 1ca9c0e (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> 5a2009f (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
  29. 3 ======= <<<<<<< HEAD
  30. 92 =======
  31. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
  32. 90 >>>>>>> 752f0c0 (Featire specs) =======
  33. 3 >>>>>>> bd8bda4 (Manifest_cache true) =======
  34. 90 >>>>>>> 4e81ea2 (Featire specs) =======
  35. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
  36. 90 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= =======
  37. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
  38. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) =======
  39. 109 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs)
  40. 109 =======
  41. 90 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= =======
  42. 90 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= =======
  43. 90 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= =======
  44. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= =======
  45. 90 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) =======
  46. 1 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) =======
  47. 111 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs)
  48. 111 =======
  49. 90 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= =======
  50. 90 >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs) description { FFaker::Book.description }
  51. <<<<<<< HEAD <<<<<<< HEAD
  52. 92 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 365d41e (Featire specs) ======= >>>>>>> c05ee51 (Featire specs) ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> 13fca83 (Rebased) ======= >>>>>>> ae884b4 (Fix) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 1ca9c0e (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> 5a2009f (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
  53. 3 ======= <<<<<<< HEAD
  54. 82 =======
  55. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
  56. 80 >>>>>>> 752f0c0 (Featire specs) =======
  57. 3 >>>>>>> bd8bda4 (Manifest_cache true) =======
  58. 80 >>>>>>> 4e81ea2 (Featire specs) =======
  59. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
  60. 80 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= =======
  61. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
  62. 82 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) =======
  63. 92 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs)
  64. 92 =======
  65. 80 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= =======
  66. 80 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= =======
  67. 80 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= =======
  68. 80 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= =======
  69. 80 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) =======
  70. 1 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) =======
  71. 94 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs)
  72. 94 =======
  73. 80 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= =======
  74. 80 >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41e (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> 13fca83 (Rebased) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 1ca9c0e (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 1ca9c0e (Featire specs) price_cents { FFaker::Number.rand(10_000) } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= price_cents { FFaker::Number.rand(10_000) } ======= <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) price_cents { FFaker::Number.rand(10_000) } ======= price { FFaker::Number.rand(100) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= price { FFaker::Number.rand(100) } >>>>>>> 752f0c0 (Featire specs) ======= price { FFaker::Number.rand(100) } >>>>>>> 4e81ea2 (Featire specs) ======= price { FFaker::Number.rand(100) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= price { FFaker::Number.rand(100) } >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509ee (Featire specs) ======= price_cents { FFaker::Number.rand(10_000) } >>>>>>> 75fa7e1 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 365d41e (Featire specs) ======= >>>>>>> c05ee51 (Featire specs) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 1ca9c0e (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= price { FFaker::Number.rand(100) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= price { FFaker::Number.rand(100) } >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= price { FFaker::Number.rand(100) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= price { FFaker::Number.rand(100) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= price { FFaker::Number.rand(100) } >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= price_cents { FFaker::Number.rand(10_000) } >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= price { FFaker::Number.rand(100) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs)
  75. <<<<<<< HEAD <<<<<<< HEAD
  76. 109 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 365d41e (Featire specs) ======= >>>>>>> c05ee51 (Featire specs) ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> 13fca83 (Rebased) ======= >>>>>>> ae884b4 (Fix) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 1ca9c0e (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> 5a2009f (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
  77. 3 ======= <<<<<<< HEAD
  78. 92 =======
  79. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
  80. 90 >>>>>>> 752f0c0 (Featire specs) =======
  81. 3 >>>>>>> bd8bda4 (Manifest_cache true) =======
  82. 90 >>>>>>> 4e81ea2 (Featire specs) =======
  83. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
  84. 90 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= =======
  85. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
  86. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) =======
  87. 109 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs)
  88. 109 =======
  89. 90 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= =======
  90. 90 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= =======
  91. 90 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= =======
  92. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= =======
  93. 90 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) =======
  94. 1 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) =======
  95. 111 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs)
  96. 111 =======
  97. 90 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= =======
  98. 90 >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs) materials { FFaker::Book.cover(:format) }
  99. <<<<<<< HEAD <<<<<<< HEAD
  100. 109 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 365d41e (Featire specs) ======= >>>>>>> c05ee51 (Featire specs) ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> 13fca83 (Rebased) ======= >>>>>>> ae884b4 (Fix) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 1ca9c0e (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> 5a2009f (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
  101. 3 ======= <<<<<<< HEAD
  102. 92 =======
  103. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
  104. 90 >>>>>>> 752f0c0 (Featire specs) =======
  105. 3 >>>>>>> bd8bda4 (Manifest_cache true) =======
  106. 90 >>>>>>> 4e81ea2 (Featire specs) =======
  107. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
  108. 90 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= =======
  109. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
  110. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) =======
  111. 109 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs)
  112. 109 =======
  113. 90 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= =======
  114. 90 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= =======
  115. 90 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= =======
  116. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= =======
  117. 90 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) =======
  118. 1 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) =======
  119. 111 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs)
  120. 111 =======
  121. 90 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= =======
  122. 90 >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs) year_of_publication { FFaker::Number.rand(1900..2022) }
  123. <<<<<<< HEAD <<<<<<< HEAD
  124. 109 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 365d41e (Featire specs) ======= >>>>>>> c05ee51 (Featire specs) ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> 13fca83 (Rebased) ======= >>>>>>> ae884b4 (Fix) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 1ca9c0e (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> 5a2009f (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
  125. 3 ======= <<<<<<< HEAD
  126. 92 =======
  127. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
  128. 90 >>>>>>> 752f0c0 (Featire specs) =======
  129. 3 >>>>>>> bd8bda4 (Manifest_cache true) =======
  130. 90 >>>>>>> 4e81ea2 (Featire specs) =======
  131. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
  132. 90 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= =======
  133. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
  134. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) =======
  135. 109 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs)
  136. 109 =======
  137. 90 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= =======
  138. 90 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= =======
  139. 90 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= =======
  140. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= =======
  141. 90 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) =======
  142. 1 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) =======
  143. 111 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs)
  144. 111 =======
  145. 90 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= =======
  146. 90 >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs) dimensions { FFaker::Book.cover(:size) }
  147. <<<<<<< HEAD <<<<<<< HEAD
  148. 109 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 365d41e (Featire specs) ======= >>>>>>> c05ee51 (Featire specs) ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> 13fca83 (Rebased) ======= >>>>>>> ae884b4 (Fix) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 1ca9c0e (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> 5a2009f (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
  149. 3 ======= <<<<<<< HEAD
  150. 92 =======
  151. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
  152. 90 >>>>>>> 752f0c0 (Featire specs) =======
  153. 3 >>>>>>> bd8bda4 (Manifest_cache true) =======
  154. 90 >>>>>>> 4e81ea2 (Featire specs) =======
  155. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
  156. 90 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD quantity { FFaker::Number.rand(2..10) } ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= =======
  157. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
  158. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  159. 109 >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs)
  160. 109 =======
  161. 90 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> a636fda (Featire specs) ======= =======
  162. 90 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= =======
  163. 90 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= =======
  164. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) >>>>>>> 3723aad (Featire specs) ======= =======
  165. 90 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) =======
  166. 1 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) =======
  167. 111 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs)
  168. 111 =======
  169. 90 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= =======
  170. 90 >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 6e923b9 (Featire specs) quantity { FFaker::Number.rand(0..10) } ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) quantity { FFaker::Number.rand(2..10) } ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 752f0c0 (Featire specs) ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) ======= ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) quantity { FFaker::Number.rand(2..10) } ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 4e81ea2 (Featire specs) ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 4e81ea2 (Featire specs) ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= ======= quantity { FFaker::Number.rand(2..10) } ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs)
  171. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= >>>>>>> 34509ee (Featire specs) ======= >>>>>>> 75fa7e1 (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 365d41e (Featire specs) ======= >>>>>>> c05ee51 (Featire specs) ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> 13fca83 (Rebased) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 1ca9c0e (Featire specs) ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs)
  172. 1 transient do
  173. 1 categories_count { 1 }
  174. end
  175. 1 transient do
  176. 1 authors_count { 1 }
  177. end
  178. 1 after :create do |book, authors_count|
  179. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  180. 110 =======
  181. 108 >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 557c1b8 (Fix)
  182. 108 =======
  183. 110 >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= =======
  184. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= =======
  185. 110 >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) book.authors do
  186. Array.new(authors_count) do
  187. association(:book, authors: [instance])
  188. end
  189. end
  190. end
  191. 1 after :create do |book, categories_count|
  192. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  193. 110 =======
  194. 108 >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 557c1b8 (Fix)
  195. 108 =======
  196. 110 >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= =======
  197. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= =======
  198. 110 >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) book.categories do
  199. Array.new(categories_count) do
  200. association(:book, categories: [instance])
  201. end
  202. end
  203. end
  204. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509ee (Featire specs) ======= >>>>>>> 75fa7e1 (Rebased) ======= ======= >>>>>>> 13fca83 (Rebased) ======= >>>>>>> f136376 (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs) end
  205. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41e (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> 13fca83 (Rebased) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 1ca9c0e (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 1ca9c0e (Featire specs)
  206. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  207. ======= <<<<<<< HEAD >>>>>>> 8480924 (Featire specs)
  208. =======
  209. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  210. >>>>>>> 752f0c0 (Featire specs) =======
  211. >>>>>>> 4e81ea2 (Featire specs) =======
  212. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= =======
  213. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509ee (Featire specs) =======
  214. >>>>>>> 75fa7e1 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 365d41e (Featire specs) ======= >>>>>>> c05ee51 (Featire specs) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 1ca9c0e (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= =======
  215. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) =======
  216. >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= =======
  217. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
  218. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= =======
  219. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= =======
  220. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= =======
  221. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs) end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8480924 (Featire specs) ======= >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41e (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> 13fca83 (Rebased) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 1ca9c0e (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 1ca9c0e (Featire specs)

spec/factories/books_categories.rb

======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8480924 (Featire specs)

spec/factories/books_categories.rb

=======

spec/factories/books_category.rb

>>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======

spec/factories/books_category.rb

>>>>>>> 752f0c0 (Featire specs) =======

spec/factories/books_category.rb

>>>>>>> 4e81ea2 (Featire specs) =======

spec/factories/books_category.rb

>>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= =======

spec/factories/books_category.rb

>>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509ee (Featire specs) =======

spec/factories/books_categories.rb

>>>>>>> 75fa7e1 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 365d41e (Featire specs) ======= >>>>>>> c05ee51 (Featire specs) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 1ca9c0e (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) =======

spec/factories/books_category.rb

>>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 77d62af (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= =======

spec/factories/books_category.rb

>>>>>>> 4e81ea2 (Featire specs) =======

spec/factories/books_category.rb

>>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= =======

spec/factories/books_category.rb

>>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= =======

spec/factories/books_categories.rb

>>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs)

100.0% lines covered

4 relevant lines. 4 lines covered and 0 lines missed.
    
  1. 1 FactoryBot.define do
  2. 1 factory :books_category do
  3. 1 book
  4. 1 category
  5. end
  6. end

spec/factories/categories.rb

100.0% lines covered

3 relevant lines. 3 lines covered and 0 lines missed.
    
  1. 1 FactoryBot.define do
  2. 1 factory :category do
  3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  4. 12 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> 251144b (Manifest_cache true) >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price)
  5. 12 >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> d782a28 (Manifest_cache true)
  6. 12 >>>>>>> b832d45 (Featire specs) >>>>>>> 86d584a (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> 4f4ea3f (Featire specs)
  7. 1 ======= <<<<<<< HEAD
  8. 8 =======
  9. 1 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
  10. 8 >>>>>>> 752f0c0 (Featire specs) =======
  11. 1 >>>>>>> bd8bda4 (Manifest_cache true) =======
  12. 8 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) =======
  13. 1 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 9440753 (Featire specs) =======
  14. 8 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= =======
  15. 1 >>>>>>> 183b6c5 (Manifest_cache true) ======= ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= =======
  16. 1 >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 824bb2b (Featire specs) =======
  17. 8 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= >>>>>>> 8480924 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> d8abfed (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 824bb2b (Featire specs) =======
  18. 12 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs)
  19. 12 =======
  20. 12 >>>>>>> 9620751 (Featire specs) =======
  21. 8 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) =======
  22. 1 >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 78717cc (Manifest_cache true) ======= ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) =======
  23. 8 =======
  24. 1 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 98beee2 (Manifest_cache true) ======= ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) =======
  25. 8 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= =======
  26. 1 >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= =======
  27. 8 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= ======= =======
  28. 1 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= =======
  29. 8 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= =======
  30. 1 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= ======= =======
  31. 12 >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) =======
  32. 1 >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
  33. 8 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= =======
  34. 1 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= =======
  35. 8 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) =======
  36. 1 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) =======
  37. 12 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6d (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2179316 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0e (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> d245196 (Manifest_cache true) name { FFaker::Book.genre }
  38. end
  39. end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= >>>>>>> 6066f92 (Add login registration pages) ======= >>>>>>> 6e923b9 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3 (Add login registration pages) ======= >>>>>>> 34509ee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e989024 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= <<<<<<< HEAD ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> 78717cc (Manifest_cache true) ======= >>>>>>> 98beee2 (Manifest_cache true) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 385b8df (Manifest_cache true) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> 7bc7f9f (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= >>>>>>> 156ffe6 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 6066f92 (Add login registration pages) ======= >>>>>>> adc21e0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= >>>>>>> 84d0df6 (Manifest_cache true) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 793a6ed (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 8249ff3 (Add login registration pages) ======= >>>>>>> 4d90e3d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= >>>>>>> 450f4e3 (Manifest_cache true) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= >>>>>>> c5efe8e (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> e989024 (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> fc3774f (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= >>>>>>> 4f4ea3f (Featire specs) =======
======= <<<<<<< HEAD ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= ======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3 (Add login registration pages) ======= ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024 (Add login registration pages)

spec/factories/reviews.rb

======= ======= >>>>>>> 7375d4b (Manifest_cache true) =======

spec/factories/users.rb

<<<<<<< HEAD ======= ======= =======

spec/factories/users.rb

======= =======

spec/factories/users.rb

======= ======= >>>>>>> bf554f4 (Rebased)

spec/factories/reviews.rb

<<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 730a8ca (Add login registration pages) ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages)

spec/factories/reviews.rb

======= <<<<<<< HEAD =======

spec/factories/users.rb

======= <<<<<<< HEAD ======= =======

spec/factories/users.rb

======= =======

spec/factories/users.rb

======= ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true)

spec/factories/reviews.rb

<<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= ======= ======= >>>>>>> 7375d4b (Manifest_cache true)

spec/feature/book_spec.rb

>>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= =======

spec/feature/book_spec.rb

>>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs)

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 2 relevant lines. 2 lines covered and ======= ======= >>>>>>> af057e3 (Featire specs) 5 relevant lines. 5 lines covered and ======= 105 relevant lines. 105 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= 105 relevant lines. 105 lines covered and >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) 0 lines missed.
    
  1. 1 <<<<<<< HEAD <<<<<<< HEAD FactoryBot.define do ======= require 'rails_helper' >>>>>>> d0dc1f1 (Featire specs) ======= require 'rails_helper' >>>>>>> 752f0c0 (Featire specs)
  2. <<<<<<< HEAD <<<<<<< HEAD
  3. 1 =======
  4. >>>>>>> d0dc1f1 (Featire specs) =======
  5. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD factory :user do
  6. end
  7. end
>>>>>>> e1f4d17 (Add login registration pages)

spec/feature/book_spec.rb

>>>>>>> 7a02bbe (Featire specs) =======

spec/feature/book_spec.rb

>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD 2 relevant lines. 2 lines covered and ======= 105 relevant lines. 105 lines covered and >>>>>>> 7a02bbe (Featire specs) ======= 105 relevant lines. 105 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 0 lines missed.
    
  1. 1 <<<<<<< HEAD <<<<<<< HEAD FactoryBot.define do
  2. 1 factory :user do
  3. end
  4. end
>>>>>>> 730a8ca (Add login registration pages) >>>>>>> e5752db (Featire specs)

spec/feature/book_spec.rb

>>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= =======

spec/feature/book_spec.rb

>>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs)

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD 2 relevant lines. 2 lines covered and ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD 5 relevant lines. 5 lines covered and ======= 105 relevant lines. 105 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= 105 relevant lines. 105 lines covered and >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) 0 lines missed.
    
  1. 1 <<<<<<< HEAD <<<<<<< HEAD FactoryBot.define do ======= require 'rails_helper' >>>>>>> d0dc1f1 (Featire specs) ======= require 'rails_helper' >>>>>>> 752f0c0 (Featire specs)
  2. <<<<<<< HEAD <<<<<<< HEAD
  3. 1 =======
  4. >>>>>>> d0dc1f1 (Featire specs) =======
  5. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD factory :user do
  6. end
  7. end
>>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs)

spec/feature/book_spec.rb

>>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= =======

spec/feature/book_spec.rb

>>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= <<<<<<< HEAD ======= =======

spec/feature/book_spec.rb

>>>>>>> 4e81ea2 (Featire specs) =======

spec/feature/book_spec.rb

>>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774f (Featire specs)

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 2 relevant lines. 2 lines covered and ======= ======= >>>>>>> d8dd3b4 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> fc3774f (Featire specs) 5 relevant lines. 5 lines covered and ======= <<<<<<< HEAD 5 relevant lines. 5 lines covered and ======= 105 relevant lines. 105 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= 105 relevant lines. 105 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= 105 relevant lines. 105 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 105 relevant lines. 105 lines covered and >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= 5 relevant lines. 5 lines covered and >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) >>>>>>> 13fca83 (Rebased) 0 lines missed.
    
  1. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) FactoryBot.define do ======= <<<<<<< HEAD FactoryBot.define do ======= require 'rails_helper' >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= require 'rails_helper' >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD ======= ======= require 'rails_helper' >>>>>>> 4e81ea2 (Featire specs) ======= require 'rails_helper' >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= require 'rails_helper' >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= require 'rails_helper' >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= ======= require 'rails_helper' >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= FactoryBot.define do >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased)
  2. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
  3. 1 ======= <<<<<<< HEAD
  4. 1 =======
  5. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= =======
  6. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) =======
  7. >>>>>>> 4e81ea2 (Featire specs) =======
  8. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= =======
  9. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  10. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= =======
  11. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) =======
  12. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD factory :user do
  13. end
  14. end
>>>>>>> e1f4d17 (Add login registration pages)

spec/feature/book_spec.rb

>>>>>>> 7a02bbe (Featire specs) =======

spec/feature/book_spec.rb

>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD 2 relevant lines. 2 lines covered and ======= 105 relevant lines. 105 lines covered and >>>>>>> 7a02bbe (Featire specs) ======= 105 relevant lines. 105 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 0 lines missed.
    
  1. 1 <<<<<<< HEAD <<<<<<< HEAD FactoryBot.define do
  2. 1 factory :user do
  3. end
  4. end
>>>>>>> 730a8ca (Add login registration pages)

spec/feature/book_spec.rb

>>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 8249ff3 (Add login registration pages)

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 FactoryBot.define do
  2. 1 factory :user do
  3. end
  4. end
>>>>>>> 1214e1f (Add login registration pages)

spec/feature/book_spec.rb

>>>>>>> d0dc1f1 (Featire specs) =======

spec/feature/book_spec.rb

>>>>>>> 752f0c0 (Featire specs) =======

spec/feature/book_spec.rb

>>>>>>> 4e81ea2 (Featire specs) =======

spec/feature/book_spec.rb

>>>>>>> 08edf50 (Featire specs)

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 75fa7e1 (Rebased) 5 relevant lines. 5 lines covered and 0 lines missed.
    
  1. 1 FactoryBot.define do <<<<<<< HEAD ======= require 'rails_helper' >>>>>>> d0dc1f1 (Featire specs) ======= require 'rails_helper' >>>>>>> 752f0c0 (Featire specs) ======= require 'rails_helper' >>>>>>> 4e81ea2 (Featire specs) ======= require 'rails_helper' >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= require 'rails_helper' >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= require 'rails_helper' >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= require 'rails_helper' >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 75fa7e1 (Rebased)
  2. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price)
  3. 1 =======
  4. >>>>>>> d0dc1f1 (Featire specs) =======
  5. >>>>>>> 752f0c0 (Featire specs) =======
  6. >>>>>>> 4e81ea2 (Featire specs) =======
  7. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= =======
  8. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  9. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= =======
  10. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) =======
  11. 1 >>>>>>> 75fa7e1 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) factory :review do ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= factory :review do >>>>>>> 75fa7e1 (Rebased) ======= ======= >>>>>>> d8dd3b4 (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) <<<<<<< HEAD factory :review do ======= <<<<<<< HEAD factory :review do ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= ======= ======= factory :review do >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs)
  12. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) title { FFaker::Lorem.words(5) } ======= RSpec.describe 'Books', type: :feature do >>>>>>> d0dc1f1 (Featire specs) ======= RSpec.describe 'Books', type: :feature do >>>>>>> 752f0c0 (Featire specs) ======= RSpec.describe 'Books', type: :feature do >>>>>>> 4e81ea2 (Featire specs) ======= RSpec.describe 'Books', type: :feature do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= RSpec.describe 'Books', type: :feature do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= RSpec.describe 'Books', type: :feature do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= RSpec.describe 'Books', type: :feature do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= title { FFaker::Lorem.words(5) } >>>>>>> 75fa7e1 (Rebased) ======= ======= >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41e (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= >>>>>>> 13fca83 (Rebased) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 1ca9c0e (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 1ca9c0e (Featire specs) title { FFaker::Lorem.words(5) } ======= <<<<<<< HEAD title { FFaker::Lorem.words(5) } ======= RSpec.describe 'Books', type: :feature do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs)
  13. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 75fa7e1 (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs)
  14. 1 rating { FFaker::Number.rand(0..5) }
  15. 1 body { FFaker::Lorem.words(500) }
  16. end
  17. end

spec/factories/shippings.rb

100.0% lines covered

8 relevant lines. 8 lines covered and 0 lines missed.
    
  1. 1 FactoryBot.define do
  2. 1 factory :shipping do
  3. 1 user
  4. 1 address { FFaker::AddressUA.street_address }
  5. 1 city { FFaker::AddressUA.city }
  6. 1 zip { FFaker::AddressUA.zip_code }
  7. 1 country { FFaker::AddressUA.country }
  8. 1 phone { FFaker::PhoneNumberUA.home_phone_number }
  9. end
  10. end
>>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs)

spec/factories/users.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 FactoryBot.define do
  2. 1 factory :user do
  3. <<<<<<< HEAD <<<<<<< HEAD
  4. =======
  5. 1 =======
  6. 13 >>>>>>> 67ab529 (Fix) email { FFaker::Internet.email }
  7. 20 password { 'password' }
  8. 20 confirmed_at { Time.zone.now }
  9. >>>>>>> 75fa7e1 (Rebased) end
  10. end
<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs)

spec/factories/reviews.rb

======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs)

spec/factories/reviews.rb

======= ======= >>>>>>> 824bb2b (Featire specs) =======
>>>>>>> c033601 (Rebased)

spec/feature/admin/author_spec.rb

<<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) >>>>>>> 8480924 (Featire specs)

100.0% lines covered

5 relevant lines. 5 lines covered and 0 lines missed.
    
  1. 1 FactoryBot.define do
  2. 1 factory :review do
  3. 1 title { FFaker::Lorem.words(5) } <<<<<<< HEAD ======= ======= include_context 'with api request global before and after hooks' >>>>>>> 9a49b7b (Rebased) ======= ======= RSpec.describe 'Books', type: :feature do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= RSpec.describe 'Books', type: :feature do >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= RSpec.describe 'Books', type: :feature do <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= RSpec.describe 'Books', type: :feature do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= RSpec.describe 'Books', type: :feature do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= RSpec.describe 'Books', type: :feature do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= RSpec.describe 'Books', type: :feature do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= ======= ======= title { FFaker::Lorem.words(5) } >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= RSpec.describe 'Books', type: :feature do >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs)
  4. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41e (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= >>>>>>> 13fca83 (Rebased) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 1ca9c0e (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 1ca9c0e (Featire specs)
  5. 1 =======
  6. 5 >>>>>>> d0dc1f1 (Featire specs) =======
  7. 5 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD rating { FFaker::Number.rand(0..5) } ======= let(:category_one) { FactoryBot.create(:category) } >>>>>>> d0dc1f1 (Featire specs) ======= let(:category_one) { FactoryBot.create(:category) } >>>>>>> 752f0c0 (Featire specs)
  8. <<<<<<< HEAD <<<<<<< HEAD
  9. 1 =======
  10. 3 >>>>>>> d0dc1f1 (Featire specs) =======
  11. 3 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD body { FFaker::Lorem.words(500) }
  12. end
  13. end

spec/factories/shippings.rb

100.0% lines covered

8 relevant lines. 8 lines covered and 0 lines missed.
    
  1. 1 FactoryBot.define do
  2. 1 factory :shipping do
  3. 1 user
  4. 1 address { FFaker::AddressUA.street_address }
  5. 1 city { FFaker::AddressUA.city }
  6. 1 zip { FFaker::AddressUA.zip_code }
  7. 1 country { FFaker::AddressUA.country }
  8. 1 phone { FFaker::PhoneNumberUA.home_phone_number }
  9. end
  10. end
>>>>>>> aca90e3 (Rebased)

spec/factories/users.rb

100.0% lines covered

5 relevant lines. 5 lines covered and 0 lines missed.
    
  1. 1 FactoryBot.define do
  2. 1 factory :user do
  3. 13 email { FFaker::Internet.email }
  4. 20 password { 'password' }
  5. 20 confirmed_at { Time.zone.now }
  6. end
  7. end
<<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> aca90e3 (Rebased)

spec/feature/admin/author_spec.rb

=======

spec/feature/admin/author_spec.rb

<<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c8da2e3 (Fix)

100.0% lines covered

31 relevant lines. 31 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe 'Author' do
  2. 1 include_context 'with api request authentication helper methods'
  3. 1 include_context 'with api request global before and after hooks'
  4. <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9a49b7b (Rebased) >>>>>>> 8480924 (Featire specs)
  5. 2 let(:first_name) { FFaker::Name.first_name }
  6. 2 let(:last_name) { FFaker::Name.last_name }
  7. 2 let(:new_name) { FFaker::Name.first_name }
  8. 2 let(:old_name) { author.first_name }
  9. 4 let(:author) { create(:author) }
  10. 1 before do
  11. 4 sign_in(create(:admin_user), :admin_user)
  12. end
  13. 1 it 'can create an author' do
  14. 1 visit 'admin/authors'
  15. 1 click_link('New Author')
  16. 1 fill_in 'author[first_name]', with: first_name
  17. 1 fill_in 'author[last_name]', with: last_name
  18. 2 expect { click_button('Create Author') }.to change(Author, :count).from(0).to(1)
  19. end
  20. 1 it 'can delete an author' do
  21. 1 author
  22. 1 visit 'admin/authors'
  23. 2 expect { click_link('Delete') }.to change(Author, :count).from(1).to(0)
  24. end
  25. 1 it 'can view an author' do
  26. 1 author
  27. 1 visit 'admin/authors'
  28. 1 click_link('View')
  29. 1 expect(page).to have_content(author.first_name)
  30. end
  31. 1 it 'can edit an author' do
  32. 1 author
  33. 1 visit 'admin/authors'
  34. 1 click_link('Edit')
  35. 1 fill_in 'author[first_name]', with: new_name
  36. 4 expect { click_button('Update Author') }.to change { author.reload.first_name }.from(old_name).to(new_name)
  37. end
  38. end

spec/feature/admin/book_spec.rb

100.0% lines covered

43 relevant lines. 43 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe 'Book' do
  2. 1 include_context 'with api request authentication helper methods'
  3. 1 include_context 'with api request global before and after hooks'
  4. 7 let(:book) { create(:book) }
  5. 1 let(:params) do
  6. 1 { title: FFaker::Book.title,
  7. description: FFaker::Book.description,
  8. price_cents: FFaker::Number.rand(1..100),
  9. dimensions: FFaker::Book.cover,
  10. year_of_publication: FFaker::Number.rand(1900..2022),
  11. materials: 'Soft cover',
  12. quantity: FFaker::Number.rand(2..5) }
  13. end
  14. 1 before do
  15. 6 sign_in(create(:admin_user), :admin_user)
  16. 6 book
  17. 6 visit 'admin/books'
  18. end
  19. 1 it 'can create an category' do
  20. 1 click_link('New Book')
  21. 1 fill_in 'book[title]', with: params[:title]
  22. 1 fill_in 'book[description]', with: params[:description]
  23. 1 fill_in 'book[year_of_publication]', with: params[:year_of_publication]
  24. 1 fill_in 'book[price_cents]', with: params[:price_cents]
  25. 1 fill_in 'book[materials]', with: params[:materials]
  26. 1 fill_in 'book[dimensions]', with: params[:dimensions]
  27. 1 fill_in 'book[quantity]', with: params[:quantity]
  28. 1 click_button('Create Book')
  29. 1 expect(page).to have_content(params[:title])
  30. end
  31. 1 it 'can delete an book' do
  32. 1 click_link('Delete')
  33. 1 expect(page).not_to have_content(book.title)
  34. end
  35. 1 it 'can view an book' do
  36. 1 click_link('View')
  37. 1 expect(page).to have_content(book.title)
  38. end
  39. 1 it 'can edit an book' do
  40. 1 click_link('Edit')
  41. 1 fill_in 'book[title]', with: 'New title'
  42. 1 click_button('Update Book')
  43. 1 expect(page).to have_content('New title')
  44. end
  45. 1 context 'when image' do
  46. 1 before do
  47. 2 click_link('Edit')
  48. 2 page.attach_file('book[images][]', './app/assets/images/Web-Book-Cover.png')
  49. 2 click_on 'Update Book'
  50. end
  51. 1 it 'can add images to book' do
  52. 1 expect(book.reload.images.count).to eq(1)
  53. end
  54. 1 it 'can delete images from book' do
  55. 1 click_link('Edit')
  56. 1 click_link('Delete')
  57. 1 expect(book.reload.images.count).to eq(0)
  58. end
  59. end
  60. end

spec/feature/admin/category_spec.rb

100.0% lines covered

25 relevant lines. 25 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe 'Category' do
  2. 1 include_context 'with api request authentication helper methods'
  3. 1 include_context 'with api request global before and after hooks'
  4. 2 let(:category_name) { FFaker::Book.genre }
  5. 5 let(:category) { create(:category) }
  6. 1 before do
  7. 4 sign_in(create(:admin_user), :admin_user)
  8. 4 category
  9. 4 visit 'admin/categories'
  10. end
  11. 1 it 'can create an category' do
  12. 1 click_link('New Category')
  13. 1 fill_in 'category[name]', with: category_name
  14. 1 click_button('Create Category')
  15. 1 expect(page).to have_content(category_name)
  16. end
  17. 1 it 'can delete an category' do
  18. 1 click_link('Delete')
  19. 1 expect(page).not_to have_content(category.name)
  20. end
  21. 1 it 'can view an category' do
  22. 1 click_link('View')
  23. 1 expect(page).to have_content(category.name)
  24. end
  25. 1 it 'can edit an category' do
  26. 1 click_link('Edit')
  27. 1 fill_in 'category[name]', with: 'New Genre'
  28. 1 click_button('Update Category')
  29. 1 expect(page).to have_content('New Genre')
  30. end
  31. end

spec/feature/billing_spec.rb

73.08% lines covered

26 relevant lines. 19 lines covered and 7 lines missed.
    
  1. 1 RSpec.describe 'Billing', type: :feature do
  2. 1 include_context 'with api request authentication helper methods'
  3. 1 include_context 'with api request global before and after hooks'
  4. 2 let(:user) { create(:user) }
  5. 1 let(:attributes_for) { attributes_for(:billing) }
  6. 1 describe '#fill_in', js: true do
  7. 1 it 'fill in billing' do
  8. 1 sign_in(user)
  9. 1 visit edit_user_path(user.id)
  10. 1 within('div#billing.col-md-5.mb-40') do
  11. 1 find_all('div', class: 'form-group')[0] do
  12. fill_in :first_name, with: attributes_for[:first_name]
  13. end
  14. 1 find_all('div', class: 'form-group')[1] do
  15. fill_in :last_name, with: attributes_for[:last_name]
  16. end
  17. 1 find_all('div', class: 'form-group')[2] do
  18. fill_in :address, with: attributes_for[:address]
  19. end
  20. 1 find_all('div', class: 'form-group')[3] do
  21. fill_in :city, with: attributes_for[:city]
  22. end
  23. 1 find_all('div', class: 'form-group')[4] do
  24. fill_in :zip, with: attributes_for[:zip]
  25. end
  26. 1 find_all('div', class: 'form-group')[5] do
  27. fill_in :country, with: attributes_for[:country]
  28. end
  29. 1 find_all('div', class: 'form-group')[6] do
  30. fill_in :phone, with: attributes_for[:phone]
  31. end
  32. 1 click_on I18n.t('settings.save')
  33. end
  34. 1 expect(page).to have_content(I18n.t('settings.message.update'))
  35. end
  36. end
  37. end

spec/feature/book_spec.rb

100.0% lines covered

104 relevant lines. 104 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe 'Book', type: :feature do
  2. 5 let(:category_one) { create(:category) }
  3. 3 let(:category_two) { create(:category) }
  4. 1 let(:params) do
  5. 4 { title: FFaker::Book.title,
  6. description: FFaker::Book.description,
  7. price_cents: FFaker::Number.rand(1..100),
  8. dimensions: FFaker::Book.cover,
  9. year_of_publication: FFaker::Number.rand(1900..2022),
  10. materials: 'Soft cover',
  11. quantity: FFaker::Number.rand(2..5) }
  12. end
  13. 7 let(:book) { create(:book).decorate }
  14. 1 describe '#show book' do
  15. 1 it 'show books info' do
  16. 1 visit "books/#{book.id}"
  17. 1 expect(page).to have_content(book.title)
  18. end
  19. 1 it 'clicked Beck to results' do
  20. 1 visit "books/#{book.id}"
  21. 1 find('a', class: 'general-back-link').click
  22. 1 expect(page).to have_content(I18n.t('catalog_page.title'))
  23. end
  24. 1 context 'when test read more' do
  25. 1 it 'show read more' do
  26. 1 visit "books/#{book.id}"
  27. 1 expect(page).to have_content(I18n.t('book_page.read_more'))
  28. end
  29. 1 it 'clicked read more', js: true do
  30. 1 visit "books/#{book.id}"
  31. 1 click_link I18n.t('book_page.read_more')
  32. 1 expect(page).not_to have_content(I18n.t('book_page.read_more'))
  33. end
  34. end
  35. 1 context 'when quantity changes', js: true do
  36. 1 before do
  37. 2 visit "books/#{book.id}"
  38. 2 find('a', class: 'inc').click
  39. end
  40. 1 it 'increase quantity' do
  41. 1 expect(page).to have_content("€#{Money.new(book.price_cents * 2)}")
  42. end
  43. 1 it 'decrease quantity' do
  44. 1 find('a', class: 'dec').click
  45. 1 expect(page).to have_content("€#{book.price}")
  46. end
  47. end
  48. end
  49. 1 describe '#catalog' do
  50. 1 describe 'filter by category' do
  51. 1 before do
  52. 2 category_one.books.create(params)
  53. 2 visit books_path
  54. end
  55. 1 after do
  56. 2 category_one.destroy
  57. end
  58. 1 it 'show book count for category' do
  59. 1 expect(page).to have_content(category_one.books.size)
  60. end
  61. 1 it 'filter book by category' do
  62. 1 within 'ul', class: 'list-inline pt-10 mb-25 mr-240', id: 'filter' do
  63. 1 click_on category_one.name
  64. end
  65. 1 expect(page).to have_content(category_one.books.first.title)
  66. end
  67. end
  68. 1 describe 'filter by all books' do
  69. 1 before do
  70. 2 category_one.books.create(params)
  71. 2 category_two.books.create(params)
  72. 2 visit books_path
  73. 2 click_on I18n.t('catalog_page.all')
  74. end
  75. 1 after do
  76. 2 category_one.destroy
  77. 2 category_two.destroy
  78. end
  79. 1 it 'shown books for first category' do
  80. 1 expect(page).to have_content(category_one.books.first.title)
  81. end
  82. 1 it 'shown books for second category' do
  83. 1 expect(page).to have_content(category_two.books.first.title)
  84. end
  85. end
  86. end
  87. 1 describe 'load_more' do
  88. 1 before do
  89. 3 24.times do
  90. 72 books << create(:book)
  91. end
  92. end
  93. 4 let(:books) { [] }
  94. 1 it 'show books without view more button' do
  95. 1 visit books_path
  96. 1 find('a', id: 'view_more', class: 'view_more').click
  97. 1 expect(page).not_to have_css('a', class: 'view_more hidden', id: 'view_more')
  98. end
  99. 1 context 'when view more' do
  100. 1 it 'show books with view more button' do
  101. 1 visit books_path
  102. 1 expect(page).to have_css('a', class: 'view_more')
  103. end
  104. 1 it 'show loaded books', js: true do
  105. 1 visit books_path
  106. 1 find('a', class: 'view_more').click
  107. 1 expect(page).to have_content(books.last.title)
  108. end
  109. end
  110. end
  111. 1 describe 'sort' do
  112. 1 shared_examples 'sort test' do
  113. 5 it 'sort books' do
  114. 5 create(:book, title: 'Zimbabwe', price_cents: 75,
  115. created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
  116. 5 create(:book, title: 'Anna', price_cents: 23,
  117. created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
  118. 5 visit books_path
  119. 5 find('a', class: 'dropdown-toggle lead small', text: I18n.t('catalog_page.sorting.newer_first'),
  120. id: 'menu').click
  121. 5 within 'ul', class: 'dropdown-menu', id: 'sort' do
  122. 5 click_link button
  123. end
  124. 5 expect(find('.col-xs-6.col-sm-3', match: :first)).to have_content(book_title)
  125. end
  126. end
  127. 1 context 'when sort by title A to Z' do
  128. 2 let(:button) { I18n.t('catalog_page.sorting.title.asc') }
  129. 2 let(:book_title) { 'Anna' }
  130. 1 include_examples 'sort test'
  131. end
  132. 1 context 'when sort by title Z to A' do
  133. 2 let(:button) { I18n.t('catalog_page.sorting.title.desc') }
  134. 2 let(:book_title) { 'Zimbabwe' }
  135. 1 include_examples 'sort test'
  136. end
  137. 1 context 'when sort by price High to Low' do
  138. 2 let(:button) { I18n.t('catalog_page.sorting.price.desc') }
  139. 2 let(:book_title) { 'Zimbabwe' }
  140. 1 include_examples 'sort test'
  141. end
  142. 1 context 'when sort by price Low to High' do
  143. 2 let(:button) { I18n.t('catalog_page.sorting.price.asc') }
  144. 2 let(:book_title) { 'Anna' }
  145. 1 include_examples 'sort test'
  146. end
  147. 1 context 'when sort by newest' do
  148. 2 let(:button) { I18n.t('catalog_page.sorting.newer_first') }
  149. 2 let(:book_title) { 'Zimbabwe' }
  150. 1 include_examples 'sort test'
  151. end
  152. end
  153. end

spec/feature/home_spec.rb

100.0% lines covered

49 relevant lines. 49 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe 'Home', type: :feature do
  2. 1 include_context 'with api request authentication helper methods'
  3. 1 include_context 'with api request global before and after hooks'
  4. 1 describe 'Get Started' do
  5. 1 it 'on click move to catalog page' do
  6. 1 visit root_path
  7. 1 click_on 'Get Started'
  8. 1 expect(page).to have_content('Catalog')
  9. end
  10. end
  11. 1 describe 'navbar' do
  12. 2 let(:books_category) { create(:books_category) }
  13. 1 it 'on click home move to root-path' do
  14. 1 visit books_path
  15. 1 find('a', id: 'root').click
  16. 1 expect(page).to have_content('Get Started')
  17. end
  18. 1 it 'on click category name move to root-path with books that belong to this category' do
  19. 1 books_category
  20. 1 visit root_path
  21. 1 find('a', class: 'dropdown-toggle', text: 'Shop').click
  22. 1 within('ul', id: 'nav') do
  23. 1 find('a', class: 'collapse-link', text: books_category.category.name).click
  24. end
  25. 1 expect(page).to have_content(books_category.category.books.first.title)
  26. end
  27. 1 context 'when guest' do
  28. 1 it 'on click login go to login page' do
  29. 1 visit root_path
  30. 1 within 'div', class: 'visible-xs' do
  31. 1 click_link I18n.t('header.log_in')
  32. end
  33. 1 expect(page).to have_content(I18n.t('header.log_in'))
  34. end
  35. 1 it 'on click sing up go to sing up page' do
  36. 1 visit root_path
  37. 1 within 'div', class: 'visible-xs' do
  38. 1 click_link I18n.t('header.sing_up')
  39. end
  40. 1 expect(page).to have_content(I18n.t('header.sing_up'))
  41. end
  42. end
  43. 1 context 'when user', js: true do
  44. 4 let(:user) { create(:user) }
  45. 1 before do
  46. 3 sign_in(user)
  47. end
  48. 1 it 'on click account show settings' do
  49. 1 visit root_path
  50. 1 click_on I18n.t('header.account')
  51. 1 expect(page).to have_content(I18n.t('header.settings'))
  52. end
  53. 1 it 'on click account show log_out' do
  54. 1 visit root_path
  55. 1 click_on I18n.t('header.account')
  56. 1 expect(page).to have_content(I18n.t('header.log_out'))
  57. end
  58. 1 it 'log_out' do
  59. 1 visit root_path
  60. 1 click_on I18n.t('header.account')
  61. 1 click_on(I18n.t('header.log_out'), match: :first)
  62. 1 expect(page).to have_content(I18n.t('devise.sessions.signed_out'))
  63. end
  64. end
  65. end
  66. end

spec/feature/login_spec.rb

>>>>>>> a5d032d (Fix) 100.0% lines covered

<<<<<<< HEAD 31 relevant lines. 31 lines covered and ======= 19 relevant lines. 19 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe 'Login', type: :feature do
  2. 3 let(:user_second) { create(:user, email: 'test.rspec@rspec.ua') }
  3. 1 describe '#login' do
  4. 1 before do
  5. 2 visit new_user_session_path
  6. end
  7. 1 context 'when successfully login' do
  8. 1 it 'login' do
  9. 1 within 'form', class: 'new_user', id: 'new_user' do
  10. 1 fill_in 'user_email', with: user_second.email
  11. 1 fill_in 'user_password', with: user_second.password
  12. 1 click_on I18n.t('header.log_in')
  13. end
  14. 1 expect(page).to have_text I18n.t('devise.sessions.signed_in')
  15. end
  16. end
  17. 1 context 'when unsuccessfully login' do
  18. 1 it 'didn`t login' do
  19. 1 within 'form', class: 'new_user', id: 'new_user' do
  20. 1 fill_in 'user_email', with: user_second.email
  21. 1 fill_in 'user_password', with: 'wrong_password'
  22. 1 click_on I18n.t('header.log_in')
  23. end
  24. 1 expect(page).to have_text 'Invalid Email or password.'
  25. end
  26. end
  27. end
  28. end

spec/feature/new_password_spec.rb

100.0% lines covered

13 relevant lines. 13 lines covered and 0 lines missed.
    
  1. 1 require_relative '../rails_helper'
  2. 1 require_relative '../support/shared_context'
  3. 1 RSpec.describe 'New Password', type: :feature do
  4. 3 let(:user) { FactoryBot.create(:user) }
  5. 1 describe '#new_password' do
  6. 1 it 'change password' do
  7. 1 user.reset_password('newPassword', 'newPassword')
  8. 1 expect(user.password).to eq('newPassword')
  9. end
  10. 1 it 'not validate password' do
  11. 1 visit new_user_password_path
  12. 1 fill_in 'email', with: user.email
  13. 1 click_on I18n.t('login.send_instructions')
  14. 1 expect(page).to have_content(I18n.t('devise.passwords.send_instructions'))
  15. end
  16. end
  17. end

spec/feature/registration_spec.rb

100.0% lines covered

29 relevant lines. 29 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe 'Registration', type: :feature do
  2. 3 let(:user) { create(:user, email: 'test.rspec@rspec.ua') }
  3. 1 describe '#sing_up' do
  4. 1 before do
  5. 3 visit new_user_registration_path
  6. end
  7. 1 context 'when successfully sing_up' do
  8. 1 it 'sing_up users' do
  9. 1 within 'form', class: 'new_user', id: 'new_user' do
  10. 1 fill_in 'user_email', with: 'email-test@rspec.com'
  11. 1 fill_in 'user_password', with: user.password
  12. 1 fill_in 'user_password_confirmation', with: user.password
  13. 1 click_on I18n.t('header.sing_up')
  14. end
  15. 1 expect(page).to have_text I18n.t('devise.registrations.signed_up_but_unconfirmed')
  16. end
  17. end
  18. 1 context 'when users is already exits' do
  19. 1 it 'sing_up users' do
  20. 1 within 'form', class: 'new_user', id: 'new_user' do
  21. 1 fill_in 'user_email', with: user.email
  22. 1 fill_in 'user_password', with: user.password
  23. 1 fill_in 'user_password_confirmation', with: user.password
  24. 1 click_on I18n.t('header.sing_up')
  25. end
  26. 1 expect(page).to have_text('Email has already been taken')
  27. end
  28. end
  29. 1 context 'when unsuccessfully sing_up' do
  30. 1 it 'didn`t sing_up' do
  31. 1 within 'form', class: 'new_user', id: 'new_user' do
  32. 1 fill_in 'user_email', with: FFaker::Internet.email
  33. 1 fill_in 'user_password', with: 'password'
  34. 1 fill_in 'user_password_confirmation', with: 'wrong'
  35. 1 click_on I18n.t('header.sing_up')
  36. end
  37. 1 expect(page).to have_text '1 error prohibited this user from being saved'
  38. end
  39. end
  40. end
  41. end

spec/feature/review_spec.rb

100.0% lines covered

28 relevant lines. 28 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe 'Review', type: :feature do
  2. 1 include_context 'with api request authentication helper methods'
  3. 1 include_context 'with api request global before and after hooks'
  4. 3 let(:user) { create(:user).decorate }
  5. 3 let(:book) { create(:book).decorate }
  6. 1 before do
  7. 2 sign_in(user)
  8. 2 visit book_path(book)
  9. end
  10. 1 shared_examples 'review' do
  11. 2 it 'review' do
  12. 2 find('i', id: rating).click
  13. 2 fill_in :title, with: FFaker::Lorem.sentence(title_words)
  14. 2 fill_in :body, with: FFaker::Lorem.sentence(body_words)
  15. 2 click_on I18n.t('review.post')
  16. 2 expect(page).to have_content(result)
  17. end
  18. end
  19. 1 describe '#post review', js: true do
  20. 1 context 'when review posted' do
  21. 2 let(:rating) { "star#{rand(1..5)}" }
  22. 2 let(:title_words) { 3 }
  23. 2 let(:body_words) { 5 }
  24. 2 let(:result) { user.name_or_email }
  25. 1 include_examples 'review'
  26. end
  27. 1 context 'when review not been posted' do
  28. 2 let(:rating) { "star#{rand(1..5)}" }
  29. 2 let(:title_words) { 80 }
  30. 2 let(:body_words) { 30 }
  31. 2 let(:result) { 'Title is too long (maximum is 80 characters)' }
  32. 1 include_examples 'review'
  33. end
  34. end
  35. end

spec/feature/settings_spec.rb

100.0% lines covered

34 relevant lines. 34 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe 'Settings', type: :feature do
  2. 1 include_context 'with api request authentication helper methods'
  3. 1 include_context 'with api request global before and after hooks'
  4. 4 let(:user) { create(:user) }
  5. 1 before do
  6. 3 sign_in(user)
  7. 3 visit edit_user_path(user.id)
  8. 3 click_link I18n.t('settings.privacy')
  9. end
  10. 1 describe '#email_change' do
  11. 1 it 'change email' do
  12. 1 within('div', id: 'email') do
  13. 1 fill_in :email, with: FFaker::Internet.email
  14. 1 click_on I18n.t('settings.save')
  15. end
  16. 1 user.confirm
  17. 1 expect(page).to have_content(I18n.t('settings.message.update'))
  18. end
  19. end
  20. 1 describe '#password_change' do
  21. 1 context 'when error' do
  22. 1 it 'didnt change password' do
  23. 1 within('div', id: 'password') do
  24. 1 fill_in :current_password, with: user.password
  25. 1 fill_in :password, with: 'newPassword'
  26. 1 fill_in :password_confirmation, with: 'incorrectPassword'
  27. 1 click_on I18n.t('settings.save')
  28. end
  29. 1 user.confirm
  30. 1 expect(page).to have_content(I18n.t('settings.error.error'))
  31. end
  32. end
  33. 1 context 'when successful' do
  34. 1 it 'didnt change password' do
  35. 1 within('div', id: 'password') do
  36. 1 fill_in :current_password, with: user.password
  37. 1 fill_in :password, with: 'newPassword'
  38. 1 fill_in :password_confirmation, with: 'newPassword'
  39. 1 click_on I18n.t('settings.save')
  40. end
  41. 1 user.confirm
  42. 1 expect(page).to have_content(I18n.t('devise.failure.unauthenticated'))
  43. end
  44. end
  45. end
  46. end

spec/feature/shipping_spec.rb

73.08% lines covered

26 relevant lines. 19 lines covered and 7 lines missed.
    
  1. 1 RSpec.describe 'Shipping', type: :feature do
  2. 1 include_context 'with api request authentication helper methods'
  3. 1 include_context 'with api request global before and after hooks'
  4. 2 let(:user) { FactoryBot.create(:user) }
  5. 1 let(:attributes_for) { attributes_for(:shipping) }
  6. 1 describe '#fill_in', js: true do
  7. 1 it 'fill in shipping' do
  8. 1 sign_in(user)
  9. 1 visit edit_user_path(user.id)
  10. 1 within('div#shipping.col-md-5.mb-40') do
  11. 1 find_all('div', class: 'form-group')[0] do
  12. fill_in :first_name, with: attributes_for[:first_name]
  13. end
  14. 1 find_all('div', class: 'form-group')[1] do
  15. fill_in :last_name, with: attributes_for[:last_name]
  16. end
  17. 1 find_all('div', class: 'form-group')[2] do
  18. fill_in :address, with: attributes_for[:address]
  19. end
  20. 1 find_all('div', class: 'form-group')[3] do
  21. fill_in :city, with: attributes_for[:city]
  22. end
  23. 1 find_all('div', class: 'form-group')[4] do
  24. fill_in :zip, with: attributes_for[:zip]
  25. end
  26. 1 find_all('div', class: 'form-group')[5] do
  27. fill_in :country, with: attributes_for[:country]
  28. end
  29. 1 find_all('div', class: 'form-group')[6] do
  30. fill_in :phone, with: attributes_for[:phone]
  31. end
  32. 1 click_on I18n.t('settings.save')
  33. end
  34. 1 expect(page).to have_content(I18n.t('settings.message.update'))
  35. end
  36. end
  37. end

spec/feature/user_spec.rb

100.0% lines covered

42 relevant lines. 42 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe 'User', type: :feature do
  2. 2 let(:user) { build(:user, email: 'test.rspec@rspec.ua') }
  3. 3 let(:user_second) { create(:user, email: 'test.rspec-test@rspec.ua') }
  4. 1 describe '#sing_up' do
  5. 1 context 'when successfully sing_up' do
  6. 1 before do
  7. 1 visit new_user_registration_path
  8. 1 within 'form', class: 'new_user', id: 'new_user' do
  9. 1 fill_in 'user_email', with: user.email
  10. 1 fill_in 'user_password', with: user.password
  11. 1 fill_in 'user_password_confirmation', with: user.password
  12. 1 click_on I18n.t('header.sing_up')
  13. end
  14. end
  15. 1 it 'sing_up user' do
  16. 1 expect(page).to have_text I18n.t('devise.registrations.signed_up_but_unconfirmed')
  17. end
  18. end
  19. 1 context 'when unsuccessfully sing_up' do
  20. 1 it 'didn`t sing_up' do
  21. 1 visit new_user_registration_path
  22. 1 within 'form', class: 'new_user', id: 'new_user' do
  23. 1 fill_in 'user_email', with: FFaker::Internet.email
  24. 1 fill_in 'user_password', with: 'wrong'
  25. 1 fill_in 'user_password_confirmation', with: 'wrong'
  26. 1 click_on I18n.t('header.sing_up')
  27. end
  28. 1 expect(page).to have_text '1 error prohibited this user from being saved'
  29. end
  30. end
  31. end
  32. 1 describe '#login' do
  33. 1 before do
  34. 2 user_second.confirm
  35. end
  36. 1 context 'when successfully login' do
  37. 1 it 'login' do
  38. 1 visit new_user_session_path
  39. 1 within 'form', class: 'new_user', id: 'new_user' do
  40. 1 fill_in 'user_email', with: user_second.email
  41. 1 fill_in 'user_password', with: user_second.password
  42. 1 click_on I18n.t('header.log_in')
  43. end
  44. 1 expect(page).to have_text I18n.t('devise.sessions.signed_in')
  45. end
  46. end
  47. 1 context 'when unsuccessfully login' do
  48. 1 it 'didn`t login' do
  49. 1 visit new_user_session_path
  50. 1 within 'form', class: 'new_user', id: 'new_user' do
  51. 1 fill_in 'user_email', with: user_second.email
  52. 1 fill_in 'user_password', with: 'wrong_password'
  53. 1 click_on I18n.t('header.log_in')
  54. end
  55. 1 expect(page).to have_text 'Invalid Email or password.'
  56. end
  57. end
  58. end
  59. end

spec/models/admin_user_spec.rb

100.0% lines covered

5 relevant lines. 5 lines covered and 0 lines missed.
    
  1. 1 require 'rails_helper'
  2. 1 RSpec.describe AdminUser, type: :model do
  3. 1 context 'when validations' do
  4. 2 it { is_expected.to validate_presence_of(:email) }
  5. 2 it { is_expected.to validate_presence_of(:password) }
  6. end
  7. end

spec/models/author_spec.rb

100.0% lines covered

8 relevant lines. 8 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe Author, type: :model do
  2. 1 describe 'author' do
  3. 1 context 'when validations' do
  4. 2 it { is_expected.to validate_presence_of(:first_name) }
  5. 2 it { is_expected.to validate_presence_of(:last_name) }
  6. end
  7. 1 context 'when associations' do
  8. 2 it { is_expected.to have_many(:authors_books).dependent(:destroy) }
  9. 2 it { is_expected.to have_many(:books).through(:authors_books) }
  10. end
  11. end
  12. end

spec/models/authors_book_spec.rb

100.0% lines covered

8 relevant lines. 8 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe AuthorsBook, type: :model do
  2. 1 describe 'authors_book' do
  3. 1 context 'when validations' do
  4. 2 it { is_expected.to validate_presence_of(:book) }
  5. 2 it { is_expected.to validate_presence_of(:author) }
  6. end
  7. 1 context 'when associations' do
  8. 2 it { is_expected.to belong_to(:author) }
  9. 2 it { is_expected.to belong_to(:book) }
  10. end
  11. end
  12. end

spec/models/billing_spec.rb

100.0% lines covered

20 relevant lines. 20 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe Billing, type: :model do
  2. 1 describe 'billing' do
  3. 1 context 'when validations' do
  4. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:first_name) }
  5. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:last_name) }
  6. 2 it { is_expected.to allow_values('+919367788755', '8989829304', '+16308520397', '786-307-3615').for(:phone) }
  7. 2 it { is_expected.to allow_values(FFaker::AddressUK.country).for(:country) }
  8. 2 it { is_expected.to allow_values(FFaker::AddressUK.city).for(:city) }
  9. 2 it { is_expected.to allow_values(FFaker::AddressUA.zip_code).for(:zip) }
  10. 2 it { is_expected.to allow_values(FFaker::Address.street_address).for(:address) }
  11. end
  12. 1 context 'when not validations' do
  13. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:first_name) }
  14. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:last_name) }
  15. 2 it { is_expected.not_to allow_values('789', '123765', '1-1-1', '+982').for(:phone) }
  16. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:country) }
  17. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:city) }
  18. 2 it { is_expected.not_to allow_values('1' * Constants::VALIDATES_ZIP_LENGTH_MAX.next).for(:zip) }
  19. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:address) }
  20. end
  21. 1 context 'when associations' do
  22. 2 it { is_expected.to belong_to(:user) }
  23. end
  24. end
  25. end

spec/models/book_spec.rb

100.0% lines covered

16 relevant lines. 16 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe Book, type: :model do
  2. 1 describe 'books' do
  3. 1 context 'when validations' do
  4. 2 it { is_expected.to validate_presence_of(:title) }
  5. 2 it { is_expected.to validate_presence_of(:description) }
  6. 2 it { is_expected.to allow_values(Constants::MIN_PRICE_IN_CENTS, Constants::MAX_PRICE_IN_CENTS).for(:price_cents) }
  7. 2 it { is_expected.to validate_presence_of(:year_of_publication) }
  8. 2 it { is_expected.to validate_presence_of(:quantity) }
  9. 2 it { is_expected.to validate_presence_of(:materials) }
  10. 2 it { is_expected.to validate_presence_of(:dimensions) }
  11. end
  12. 1 context 'when associations' do
  13. 2 it { is_expected.to have_many(:authors_books).dependent(:destroy) }
  14. 2 it { is_expected.to have_many(:authors).through(:authors_books) }
  15. 2 it { is_expected.to have_many(:books_categories).dependent(:destroy) }
  16. 2 it { is_expected.to have_many(:categories).through(:books_categories) }
  17. 2 it { is_expected.to have_many(:reviews).dependent(:destroy) }
  18. end
  19. end
  20. end

spec/models/books_category_spec.rb

100.0% lines covered

8 relevant lines. 8 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe BooksCategory, type: :model do
  2. 1 describe 'books_categories' do
  3. 1 context 'when validations' do
  4. 2 it { is_expected.to validate_presence_of(:book) }
  5. 2 it { is_expected.to validate_presence_of(:category) }
  6. end
  7. 1 context 'when associations' do
  8. 2 it { is_expected.to belong_to(:category) }
  9. 2 it { is_expected.to belong_to(:book) }
  10. end
  11. end
  12. end

spec/models/category_spec.rb

100.0% lines covered

7 relevant lines. 7 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe Category, type: :model do
  2. 1 describe 'category' do
  3. 1 context 'when validations' do
  4. 2 it { is_expected.to validate_presence_of(:name) }
  5. end
  6. 1 context 'when associations' do
  7. 2 it { is_expected.to have_many(:books_categories).dependent(:destroy) }
  8. 2 it { is_expected.to have_many(:books).through(:books_categories) }
  9. end
  10. end
  11. end

spec/models/review_spec.rb

100.0% lines covered

14 relevant lines. 14 lines covered and 0 lines missed.
    
  1. 1 require 'rails_helper'
  2. 1 RSpec.describe Review, type: :model do
  3. 1 describe 'review' do
  4. 1 context 'when validations' do
  5. 2 it { is_expected.to validate_presence_of(:title) }
  6. 2 it { is_expected.to validate_presence_of(:body) }
  7. 2 it { is_expected.to validate_presence_of(:rating) }
  8. 2 it { is_expected.to validate_presence_of(:verified) }
  9. 2 it { is_expected.to allow_values('a' * Constants::VALIDATES_TITLE_LENGTH_MAX).for(:title) }
  10. 2 it { is_expected.to allow_values('a' * Constants::VALIDATES_TEXT_LENGTH_MAX).for(:body) }
  11. 2 it { is_expected.to allow_values(1, 2, 3, 4, 5).for(:rating) }
  12. end
  13. 1 context 'when associations' do
  14. 2 it { is_expected.to belong_to(:book) }
  15. 2 it { is_expected.to belong_to(:user) }
  16. end
  17. end
  18. end

spec/models/shipping_spec.rb

100.0% lines covered

20 relevant lines. 20 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe Shipping, type: :model do
  2. 1 describe 'shipping' do
  3. 1 context 'when validations' do
  4. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:first_name) }
  5. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:last_name) }
  6. 2 it { is_expected.to allow_values('+919367788755', '8989829304', '+16308520397', '786-307-3615').for(:phone) }
  7. 2 it { is_expected.to allow_values(FFaker::AddressUK.country).for(:country) }
  8. 2 it { is_expected.to allow_values(FFaker::AddressUK.city).for(:city) }
  9. 2 it { is_expected.to allow_values(FFaker::AddressUA.zip_code).for(:zip) }
  10. 2 it { is_expected.to allow_values(FFaker::Address.street_address).for(:address) }
  11. end
  12. 1 context 'when not validations' do
  13. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:first_name) }
  14. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:last_name) }
  15. 2 it { is_expected.not_to allow_values('789', '123765', '1-1-1', '+982').for(:phone) }
  16. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:country) }
  17. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:city) }
  18. 2 it { is_expected.not_to allow_values('1' * Constants::VALIDATES_ZIP_LENGTH_MAX.next).for(:zip) }
  19. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:address) }
  20. end
  21. 1 context 'when associations' do
  22. 2 it { is_expected.to belong_to(:user) }
  23. end
  24. end
  25. end

spec/models/user_spec.rb

100.0% lines covered

9 relevant lines. 9 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe User, type: :model do
  2. 1 let(:user) { FactoryBot.create(:user) }
  3. 1 describe 'author' do
  4. 1 context 'when validations' do
  5. 2 it { is_expected.to validate_presence_of(:email) }
  6. 2 it { is_expected.to validate_presence_of(:password) }
  7. end
  8. 1 context 'with associations' do
  9. 2 it { is_expected.to have_one(:billing) }
  10. 2 it { is_expected.to have_one(:shipping) }
  11. end
  12. end
  13. end

spec/queryes/book_query_spec.rb

100.0% lines covered

45 relevant lines. 45 lines covered and 0 lines missed.
    
  1. 1 require 'rails_helper'
  2. 1 RSpec.describe BookQuery do
  3. 1 shared_examples 'sort test' do
  4. 5 it 'sort' do
  5. 5 books
  6. 5 expect(test).to eq(result)
  7. end
  8. end
  9. 3 let(:titles) { %w[Adam Zimbabwe] }
  10. 1 let(:books_dates) do
  11. 1 ['Thu, 25 Aug 2022 15:25:38.761014000 UTC +00:00', 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00']
  12. end
  13. 1 describe 'all books sort' do
  14. 1 context 'when sort by title A to Z' do
  15. 1 let(:books) do
  16. 1 create(:book, title: titles.first)
  17. 1 create(:book, title: titles.second)
  18. end
  19. 2 let(:result) { titles.second }
  20. 2 let(:test) { described_class.query({ sort: 'title DESC' }).first.title }
  21. 1 include_examples 'sort test'
  22. end
  23. 1 context 'when sort title Z to A' do
  24. 1 let(:books) do
  25. 1 create(:book, title: titles.first)
  26. 1 create(:book, title: titles.second)
  27. end
  28. 2 let(:result) { titles.first }
  29. 2 let(:test) { described_class.query({ sort: 'title' }).first.title }
  30. 1 include_examples 'sort test'
  31. end
  32. 1 context 'when sort by price High to Low' do
  33. 1 let(:books) do
  34. 1 create(:book, price_cents: 75)
  35. 1 create(:book, price_cents: 23)
  36. end
  37. 2 let(:result) { 75 }
  38. 2 let(:test) { described_class.query({ sort: 'price_cents DESC' }).first.price_cents }
  39. 1 include_examples 'sort test'
  40. end
  41. 1 context 'when sort price Low to High' do
  42. 1 let(:books) do
  43. 1 create(:book, price_cents: 75)
  44. 1 create(:book, price_cents: 23)
  45. end
  46. 2 let(:result) { 23 }
  47. 2 let(:test) { described_class.query({ sort: 'price_cents' }).first.price_cents }
  48. 1 include_examples 'sort test'
  49. end
  50. 1 context 'when sort by Newest' do
  51. 1 let(:books) do
  52. 1 create(:book, created_at: books_dates.first)
  53. 1 create(:book, created_at: books_dates.second)
  54. end
  55. 2 let(:result) { books_dates.first }
  56. 2 let(:test) { described_class.query({ sort: 'created_at DESC' }).first.created_at }
  57. 1 include_examples 'sort test'
  58. end
  59. end
  60. end

spec/support/configs/capybara.rb

100.0% lines covered

19 relevant lines. 19 lines covered and >>>>>>> a5d032d (Fix) 0 lines missed.
    
  1. 1 RSpec.describe 'Author' do
  2. 1 include_context 'with api request authentication helper methods'
  3. 1 include_context 'with api request global before and after hooks'
  4. ======= >>>>>>> 824bb2b (Featire specs)
  5. 2 let(:first_name) { FFaker::Name.first_name }
  6. 2 let(:last_name) { FFaker::Name.last_name }
  7. 2 let(:new_name) { FFaker::Name.first_name }
  8. 2 let(:old_name) { author.first_name }
  9. 4 let(:author) { create(:author) }
  10. 1 before do
  11. 4 sign_in(create(:admin_user), :admin_user)
  12. end
  13. 1 it 'can create an author' do
  14. 1 visit 'admin/authors'
  15. 1 click_link('New Author')
  16. 1 fill_in 'author[first_name]', with: first_name
  17. 1 fill_in 'author[last_name]', with: last_name
  18. 2 expect { click_button('Create Author') }.to change(Author, :count).from(0).to(1)
  19. end
  20. 1 it 'can delete an author' do
  21. 1 author
  22. 1 visit 'admin/authors'
  23. 2 expect { click_link('Delete') }.to change(Author, :count).from(1).to(0)
  24. end
  25. 1 it 'can view an author' do
  26. 1 author
  27. 1 visit 'admin/authors'
  28. 1 click_link('View')
  29. 1 expect(page).to have_content(author.first_name)
  30. end
  31. 1 it 'can edit an author' do
  32. 1 author
  33. 1 visit 'admin/authors'
  34. 1 click_link('Edit')
  35. 1 fill_in 'author[first_name]', with: new_name
  36. 4 expect { click_button('Update Author') }.to change { author.reload.first_name }.from(old_name).to(new_name)
  37. end
  38. end

spec/feature/admin/book_spec.rb

100.0% lines covered

43 relevant lines. 43 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe 'Book' do
  2. 1 include_context 'with api request authentication helper methods'
  3. 1 include_context 'with api request global before and after hooks'
  4. <<<<<<< HEAD <<<<<<< HEAD
  5. 7 =======
  6. =======
  7. >>>>>>> d0dc1f1 (Featire specs) =======
  8. >>>>>>> 752f0c0 (Featire specs) 5 >>>>>>> 93bdda9 (Featire specs) =======
  9. 7 >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD let(:book) { create(:book) } ======= <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) let(:category_one) { FactoryBot.create(:category) }
  10. 3 let(:category_two) { FactoryBot.create(:category) } <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= let(:book) { create(:book) } >>>>>>> 872e675 (Fix) ======= let(:category_two) { FactoryBot.create(:category) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= let(:category_two) { FactoryBot.create(:category) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs)
  11. 1 let(:params) do
  12. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  13. 1 =======
  14. 4 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) =======
  15. 4 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD =======
  16. 1 >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) { title: FFaker::Book.title,
  17. description: FFaker::Book.description,
  18. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) price_cents: FFaker::Number.rand(1..100), ======= price: FFaker::Number.rand(1..100), >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= price: FFaker::Number.rand(1..100), >>>>>>> 752f0c0 (Featire specs) ======= price_cents: FFaker::Number.rand(1..100), >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= price: FFaker::Number.rand(1..100), >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs)
  19. dimensions: FFaker::Book.cover,
  20. year_of_publication: FFaker::Number.rand(1900..2022),
  21. materials: 'Soft cover',
  22. quantity: FFaker::Number.rand(2..5) }
  23. end
  24. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  25. 1 before do
  26. 6 sign_in(create(:admin_user), :admin_user)
  27. 6 book
  28. 6 visit 'admin/books'
  29. end
  30. 1 it 'can create an category' do
  31. 1 click_link('New Book')
  32. 1 fill_in 'book[title]', with: params[:title]
  33. 1 fill_in 'book[description]', with: params[:description]
  34. 1 fill_in 'book[year_of_publication]', with: params[:year_of_publication]
  35. 1 fill_in 'book[price_cents]', with: params[:price_cents]
  36. 1 fill_in 'book[materials]', with: params[:materials]
  37. 1 fill_in 'book[dimensions]', with: params[:dimensions]
  38. 1 fill_in 'book[quantity]', with: params[:quantity]
  39. 1 click_button('Create Book')
  40. 1 expect(page).to have_content(params[:title])
  41. end
  42. 1 it 'can delete an book' do
  43. 1 click_link('Delete')
  44. 1 expect(page).not_to have_content(book.title)
  45. end
  46. 1 it 'can view an book' do
  47. 1 click_link('View')
  48. 1 expect(page).to have_content(book.title)
  49. end
  50. 1 it 'can edit an book' do
  51. 1 click_link('Edit')
  52. 1 fill_in 'book[title]', with: 'New title'
  53. 1 click_button('Update Book')
  54. 1 expect(page).to have_content('New title')
  55. end
  56. 1 context 'when image' do
  57. 1 before do
  58. 2 click_link('Edit')
  59. 2 page.attach_file('book[images][]', './app/assets/images/Web-Book-Cover.png')
  60. 2 click_on 'Update Book'
  61. end
  62. 1 it 'can add images to book' do
  63. 1 expect(book.reload.images.count).to eq(1)
  64. end
  65. 1 it 'can delete images from book' do
  66. 1 click_link('Edit')
  67. 1 click_link('Delete')
  68. 1 expect(book.reload.images.count).to eq(0)
  69. end
  70. end
  71. end

spec/feature/admin/category_spec.rb

100.0% lines covered

25 relevant lines. 25 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe 'Category' do
  2. 1 include_context 'with api request authentication helper methods'
  3. 1 include_context 'with api request global before and after hooks'
  4. 2 let(:category_name) { FFaker::Book.genre }
  5. 5 let(:category) { create(:category) }
  6. 1 before do
  7. 4 sign_in(create(:admin_user), :admin_user)
  8. 4 category
  9. 4 visit 'admin/categories'
  10. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) =======
  11. 7 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) =======
  12. 7 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) end ======= let(:book) { FactoryBot.create(:book) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 752f0c0 (Featire specs) ======= end >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs)
  13. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) it 'can create an category' do ======= describe '#show book' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= describe '#show book' do >>>>>>> 752f0c0 (Featire specs) ======= it 'can create an category' do >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= describe '#show book' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs)
  14. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) click_link('New Category') ======= it 'show books info' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= it 'show books info' do >>>>>>> 752f0c0 (Featire specs) ======= click_link('New Category') >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= it 'show books info' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs)
  15. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs)
  16. ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD =======
  17. ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  18. 1 visit "books/#{book.id}"
  19. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) =======
  20. >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs)
  21. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  22. =======
  23. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  24. >>>>>>> 752f0c0 (Featire specs) =======
  25. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
  26. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) fill_in 'category[name]', with: category_name ======= expect(page).to have_content(book.title) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= expect(page).to have_content(book.title) >>>>>>> 752f0c0 (Featire specs) ======= fill_in 'category[name]', with: category_name >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= expect(page).to have_content(book.title) >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs)
  27. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  28. =======
  29. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  30. >>>>>>> 752f0c0 (Featire specs) =======
  31. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
  32. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  33. 1 click_button('Create Category') <<<<<<< HEAD <<<<<<< HEAD ======= end >>>>>>> d0dc1f1 (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= end >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  34. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) expect(page).to have_content(category_name) ======= it 'clicked Beck to results' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= it 'clicked Beck to results' do >>>>>>> 752f0c0 (Featire specs) ======= expect(page).to have_content(category_name) >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= it 'clicked Beck to results' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs)
  35. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  36. =======
  37. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) =======
  38. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD =======
  39. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) end ======= visit "books/#{book.id}" >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) ======= end >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs)
  40. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) it 'can delete an category' do ======= find('a', class: 'general-back-link').click >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= find('a', class: 'general-back-link').click >>>>>>> 752f0c0 (Featire specs) ======= it 'can delete an category' do >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= find('a', class: 'general-back-link').click >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs)
  41. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  42. 1 click_link('Delete')
  43. <<<<<<< HEAD <<<<<<< HEAD =======
  44. >>>>>>> d0dc1f1 (Featire specs) =======
  45. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= =======
  46. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  47. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  48. =======
  49. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  50. >>>>>>> 752f0c0 (Featire specs) =======
  51. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
  52. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) expect(page).not_to have_content(category.name) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= expect(page).not_to have_content(category.name) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) expect(page).to have_content('Catalog')
  53. end <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= expect(page).not_to have_content(category.name) >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs)
  54. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) end ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= end >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs)
  55. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  56. =======
  57. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) =======
  58. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD =======
  59. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= context 'when test read more' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= context 'when test read more' do >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= context 'when test read more' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs)
  60. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) it 'can view an category' do ======= it 'show read more' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= it 'show read more' do >>>>>>> 752f0c0 (Featire specs) ======= it 'can view an category' do >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= it 'show read more' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs)
  61. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) click_link('View') ======= visit "books/#{book.id}" >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) ======= click_link('View') >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs)
  62. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) expect(page).to have_content(category.name) ======= expect(page).to have_content('Read More') >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= expect(page).to have_content('Read More') >>>>>>> 752f0c0 (Featire specs) ======= expect(page).to have_content(category.name) >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= expect(page).to have_content('Read More') >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs)
  63. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) end ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= end >>>>>>> 752f0c0 (Featire specs) ======= end >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs)
  64. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) it 'can edit an category' do ======= it 'clicked read more', js: true do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= it 'clicked read more', js: true do >>>>>>> 752f0c0 (Featire specs) ======= it 'can edit an category' do >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= it 'clicked read more', js: true do >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs)
  65. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) click_link('Edit') ======= visit "books/#{book.id}" >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) ======= click_link('Edit') >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs)
  66. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) fill_in 'category[name]', with: 'New Genre' ======= click_link 'Read More' >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= click_link 'Read More' >>>>>>> 752f0c0 (Featire specs) ======= fill_in 'category[name]', with: 'New Genre' >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= click_link 'Read More' >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs)
  67. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) click_button('Update Category') ======= expect(page).not_to have_content('Read More') >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= expect(page).not_to have_content('Read More') >>>>>>> 752f0c0 (Featire specs) ======= click_button('Update Category') >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= expect(page).not_to have_content('Read More') >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs)
  68. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= end >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs)
  69. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  70. 1 =======
  71. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) =======
  72. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD =======
  73. 1 >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) expect(page).to have_content('New Genre') ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= end >>>>>>> 752f0c0 (Featire specs) ======= expect(page).to have_content('New Genre') >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs)
  74. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) end
  75. end

spec/feature/billing_spec.rb

73.08% lines covered

26 relevant lines. 19 lines covered and 7 lines missed.
    
  1. 1 RSpec.describe 'Billing', type: :feature do
  2. 1 include_context 'with api request authentication helper methods'
  3. 1 include_context 'with api request global before and after hooks'
  4. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  5. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  6. 2 let(:user) { create(:user) }
  7. 1 let(:attributes_for) { attributes_for(:billing) }
  8. 1 describe '#fill_in', js: true do
  9. 1 it 'fill in billing' do
  10. 1 sign_in(user)
  11. 1 visit edit_user_path(user.id)
  12. 1 within('div#billing.col-md-5.mb-40') do
  13. 1 find_all('div', class: 'form-group')[0] do
  14. fill_in :first_name, with: attributes_for[:first_name]
  15. end
  16. 1 find_all('div', class: 'form-group')[1] do
  17. fill_in :last_name, with: attributes_for[:last_name]
  18. end
  19. 1 find_all('div', class: 'form-group')[2] do
  20. fill_in :address, with: attributes_for[:address]
  21. end
  22. 1 find_all('div', class: 'form-group')[3] do
  23. fill_in :city, with: attributes_for[:city]
  24. end
  25. 1 find_all('div', class: 'form-group')[4] do
  26. fill_in :zip, with: attributes_for[:zip]
  27. end
  28. 1 find_all('div', class: 'form-group')[5] do
  29. fill_in :country, with: attributes_for[:country]
  30. end
  31. 1 find_all('div', class: 'form-group')[6] do
  32. fill_in :phone, with: attributes_for[:phone]
  33. end
  34. 1 click_on I18n.t('settings.save')
  35. end
  36. 1 expect(page).to have_content(I18n.t('settings.message.update'))
  37. end
  38. end
  39. end

spec/feature/book_spec.rb

100.0% lines covered

104 relevant lines. 104 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe 'Book', type: :feature do
  2. 5 let(:category_one) { create(:category) }
  3. 3 let(:category_two) { create(:category) }
  4. 1 let(:params) do
  5. 4 { title: FFaker::Book.title,
  6. description: FFaker::Book.description,
  7. price_cents: FFaker::Number.rand(1..100),
  8. dimensions: FFaker::Book.cover,
  9. year_of_publication: FFaker::Number.rand(1900..2022),
  10. materials: 'Soft cover',
  11. quantity: FFaker::Number.rand(2..5) }
  12. end
  13. 7 let(:book) { create(:book).decorate }
  14. 1 describe '#show book' do
  15. 1 it 'show books info' do
  16. 1 visit "books/#{book.id}"
  17. 1 expect(page).to have_content(book.title)
  18. end
  19. 1 it 'clicked Beck to results' do
  20. 1 visit "books/#{book.id}"
  21. 1 find('a', class: 'general-back-link').click
  22. 1 expect(page).to have_content(I18n.t('catalog_page.title'))
  23. end
  24. 1 context 'when test read more' do
  25. 1 it 'show read more' do
  26. 1 visit "books/#{book.id}"
  27. 1 expect(page).to have_content(I18n.t('book_page.read_more'))
  28. end
  29. 1 it 'clicked read more', js: true do
  30. 1 visit "books/#{book.id}"
  31. 1 click_link I18n.t('book_page.read_more')
  32. 1 expect(page).not_to have_content(I18n.t('book_page.read_more'))
  33. end
  34. end
  35. <<<<<<< HEAD <<<<<<< HEAD =======
  36. >>>>>>> d0dc1f1 (Featire specs) =======
  37. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= =======
  38. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) 1 context 'when quantity changes', js: true do
  39. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  40. =======
  41. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  42. >>>>>>> 752f0c0 (Featire specs) =======
  43. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
  44. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) 1 before do
  45. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  46. 2 visit "books/#{book.id}"
  47. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  48. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) find('a', class: 'inc').click ======= visit "books/#{book.id}" >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) ======= find('a', class: 'inc').click >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs)
  49. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) end
  50. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  51. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  52. 1 =======
  53. 2 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) =======
  54. 2 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD =======
  55. 1 >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD it 'increase quantity' do >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) it 'increase quantity' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'increase quantity' do ======= it 'increase quantity', js: true do >>>>>>> 752f0c0 (Featire specs) ======= it 'increase quantity', js: true do >>>>>>> 4e81ea2 (Featire specs) ======= it 'increase quantity', js: true do >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= ======= it 'increase quantity' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= it 'increase quantity' do >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> af057e3 (Featire specs) it 'increase quantity' do ======= find('a', class: 'inc').click >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= ======= find('a', class: 'inc').click >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= it 'increase quantity' do >>>>>>> 872e675 (Fix) ======= it 'increase quantity' do ======= find('a', class: 'inc').click >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= ======= find('a', class: 'inc').click >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs)
  56. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  57. 1 expect(page).to have_content("€#{Money.new(book.price_cents * 2)}")
  58. <<<<<<< HEAD <<<<<<< HEAD =======
  59. >>>>>>> d0dc1f1 (Featire specs) =======
  60. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= =======
  61. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) end
  62. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  63. =======
  64. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  65. >>>>>>> 752f0c0 (Featire specs) =======
  66. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
  67. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs)
  68. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  69. =======
  70. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  71. >>>>>>> 752f0c0 (Featire specs) =======
  72. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
  73. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD it 'decrease quantity' do >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) it 'decrease quantity' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'decrease quantity' do ======= it 'decrease quantity', js: true do >>>>>>> 752f0c0 (Featire specs) ======= it 'decrease quantity', js: true do >>>>>>> 4e81ea2 (Featire specs) ======= it 'decrease quantity', js: true do >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= ======= it 'decrease quantity' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= it 'decrease quantity' do >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> af057e3 (Featire specs) it 'decrease quantity' do ======= it 'increase quantity', js: true do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= ======= it 'increase quantity', js: true do >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= it 'decrease quantity' do >>>>>>> 872e675 (Fix) ======= it 'decrease quantity' do ======= it 'increase quantity', js: true do >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= ======= it 'increase quantity', js: true do >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs)
  74. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  75. =======
  76. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  77. >>>>>>> 752f0c0 (Featire specs) =======
  78. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
  79. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) find('a', class: 'dec').click ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= find('a', class: 'dec').click ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) expect(page).to have_content("€#{book.price * 2}")
  80. end
  81. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= find('a', class: 'dec').click >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs)
  82. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) it 'decrease quantity', js: true do
  83. 1 find('a', class: 'dec').click
  84. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) expect(page).to have_content("€#{book.price}")
  85. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  86. end
  87. end
  88. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  89. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) end ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= end >>>>>>> 752f0c0 (Featire specs) ======= end >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs)
  90. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) end
  91. end
  92. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs)
  93. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  94. 1 describe '#catalog' do
  95. 1 describe 'filter by category' do
  96. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  97. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) describe '#catalog' do
  98. 1 describe 'filter by category' do
  99. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) before do
  100. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  101. =======
  102. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  103. >>>>>>> 752f0c0 (Featire specs) =======
  104. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
  105. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) 2 category_one.books.create(params)
  106. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  107. =======
  108. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  109. >>>>>>> 752f0c0 (Featire specs) =======
  110. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
  111. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) 2 visit books_path
  112. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  113. =======
  114. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  115. >>>>>>> 752f0c0 (Featire specs) =======
  116. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
  117. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) end
  118. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  119. =======
  120. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  121. >>>>>>> 752f0c0 (Featire specs) =======
  122. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
  123. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs)
  124. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  125. =======
  126. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  127. >>>>>>> 752f0c0 (Featire specs) =======
  128. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
  129. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) 1 after do
  130. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  131. =======
  132. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  133. >>>>>>> 752f0c0 (Featire specs) =======
  134. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
  135. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) 2 category_one.destroy
  136. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  137. =======
  138. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  139. >>>>>>> 752f0c0 (Featire specs) =======
  140. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
  141. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) end
  142. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  143. =======
  144. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  145. >>>>>>> 752f0c0 (Featire specs) =======
  146. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
  147. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs)
  148. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  149. =======
  150. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  151. >>>>>>> 752f0c0 (Featire specs) =======
  152. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
  153. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) 1 it 'show book count for category' do
  154. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  155. =======
  156. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  157. >>>>>>> 752f0c0 (Featire specs) =======
  158. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
  159. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) 1 expect(page).to have_content(category_one.books.size)
  160. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  161. =======
  162. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  163. >>>>>>> 752f0c0 (Featire specs) =======
  164. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
  165. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) end
  166. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  167. =======
  168. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  169. >>>>>>> 752f0c0 (Featire specs) =======
  170. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
  171. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs)
  172. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  173. 1 it 'filter book by category' do
  174. 1 within 'ul', class: 'list-inline pt-10 mb-25 mr-240', id: 'filter' do
  175. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  176. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) it 'filter book by category' do
  177. 1 within 'ul', class: 'list-inline pt-10 mb-25 mr-240', id: 'filter' do
  178. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) click_on category_one.name
  179. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  180. =======
  181. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  182. >>>>>>> 752f0c0 (Featire specs) =======
  183. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
  184. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) end
  185. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  186. =======
  187. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  188. >>>>>>> 752f0c0 (Featire specs) =======
  189. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
  190. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs)
  191. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  192. =======
  193. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  194. >>>>>>> 752f0c0 (Featire specs) =======
  195. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
  196. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) 1 expect(page).to have_content(category_one.books.first.title)
  197. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  198. =======
  199. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  200. >>>>>>> 752f0c0 (Featire specs) =======
  201. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
  202. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) end
  203. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  204. =======
  205. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  206. >>>>>>> 752f0c0 (Featire specs) =======
  207. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
  208. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) end
  209. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  210. =======
  211. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  212. >>>>>>> 752f0c0 (Featire specs) =======
  213. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
  214. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs)
  215. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  216. =======
  217. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  218. >>>>>>> 752f0c0 (Featire specs) =======
  219. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
  220. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) 1 describe 'filter by all books' do
  221. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  222. =======
  223. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  224. >>>>>>> 752f0c0 (Featire specs) =======
  225. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
  226. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) 1 before do
  227. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  228. =======
  229. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  230. >>>>>>> 752f0c0 (Featire specs) =======
  231. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
  232. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) 2 category_one.books.create(params)
  233. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  234. 2 category_two.books.create(params)
  235. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  236. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) visit books_path ======= category_two.books.create(params) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= category_two.books.create(params) >>>>>>> 752f0c0 (Featire specs) ======= visit books_path >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= category_two.books.create(params) >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs)
  237. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) click_on I18n.t('catalog_page.all') ======= visit books_path >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= visit books_path >>>>>>> 752f0c0 (Featire specs) ======= click_on I18n.t('catalog_page.all') >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= visit books_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs)
  238. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs)
  239. 2 click_on 'All'
  240. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) end
  241. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  242. =======
  243. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  244. >>>>>>> 752f0c0 (Featire specs) =======
  245. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
  246. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs)
  247. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  248. =======
  249. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  250. >>>>>>> 752f0c0 (Featire specs) =======
  251. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
  252. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) 1 after do
  253. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  254. =======
  255. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  256. >>>>>>> 752f0c0 (Featire specs) =======
  257. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
  258. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) 2 category_one.destroy
  259. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  260. =======
  261. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  262. >>>>>>> 752f0c0 (Featire specs) =======
  263. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
  264. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) 2 category_two.destroy
  265. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  266. =======
  267. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  268. >>>>>>> 752f0c0 (Featire specs) =======
  269. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
  270. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) end
  271. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  272. =======
  273. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  274. >>>>>>> 752f0c0 (Featire specs) =======
  275. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
  276. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs)
  277. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  278. =======
  279. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  280. >>>>>>> 752f0c0 (Featire specs) =======
  281. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
  282. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) 1 it 'shown books for first category' do
  283. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  284. =======
  285. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  286. >>>>>>> 752f0c0 (Featire specs) =======
  287. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
  288. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) 1 expect(page).to have_content(category_one.books.first.title)
  289. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  290. =======
  291. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  292. >>>>>>> 752f0c0 (Featire specs) =======
  293. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
  294. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) end
  295. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  296. =======
  297. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  298. >>>>>>> 752f0c0 (Featire specs) =======
  299. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
  300. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs)
  301. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  302. =======
  303. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  304. >>>>>>> 752f0c0 (Featire specs) =======
  305. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
  306. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) 1 it 'shown books for second category' do
  307. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  308. =======
  309. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  310. >>>>>>> 752f0c0 (Featire specs) =======
  311. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
  312. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) 1 expect(page).to have_content(category_two.books.first.title)
  313. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  314. end
  315. end
  316. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  317. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) end ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= end >>>>>>> 752f0c0 (Featire specs) ======= end >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs)
  318. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) end
  319. end
  320. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs)
  321. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  322. =======
  323. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  324. >>>>>>> 752f0c0 (Featire specs) =======
  325. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
  326. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) 1 describe 'load_more' do
  327. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  328. =======
  329. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  330. >>>>>>> 752f0c0 (Featire specs) =======
  331. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
  332. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) 1 before do
  333. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  334. =======
  335. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  336. >>>>>>> 752f0c0 (Featire specs) =======
  337. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
  338. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) 3 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 24.times do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD (BooksController::PAGINATION_PER_PAGE * 2).times do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD (BooksController::PAGINATION_PER_PAGE * 2).times do ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 752f0c0 (Featire specs) ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 4e81ea2 (Featire specs) ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= ======= ======= (BooksController::PAGINATION_PER_PAGE * 2).times do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= 24.times do >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> af057e3 (Featire specs) 24.times do ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= 24.times do >>>>>>> 872e675 (Fix) ======= 24.times do ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs)
  339. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  340. =======
  341. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  342. >>>>>>> 752f0c0 (Featire specs) =======
  343. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
  344. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) 72 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) books << create(:book)
  345. end
  346. end <<<<<<< HEAD <<<<<<< HEAD ======= books << FactoryBot.create(:book) >>>>>>> d0dc1f1 (Featire specs) ======= books << FactoryBot.create(:book) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= books << FactoryBot.create(:book) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  347. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= end >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs)
  348. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  349. 4 =======
  350. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) =======
  351. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD =======
  352. 4 >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) let(:books) { [] } ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= end >>>>>>> 752f0c0 (Featire specs) ======= let(:books) { [] } >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs)
  353. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  354. 1 =======
  355. 4 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) =======
  356. 4 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD =======
  357. 1 >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) it 'show books without view more button' do ======= let(:books) { [] } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= let(:books) { [] } >>>>>>> 752f0c0 (Featire specs) ======= it 'show books without view more button' do >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= let(:books) { [] } >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs)
  358. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  359. 1 visit books_path
  360. <<<<<<< HEAD <<<<<<< HEAD =======
  361. >>>>>>> d0dc1f1 (Featire specs) =======
  362. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= =======
  363. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  364. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs)
  365. 1 it 'show books without view more button' do
  366. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs)
  367. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) find('a', id: 'view_more', class: 'view_more').click ======= visit books_path >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= visit books_path >>>>>>> 752f0c0 (Featire specs) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= visit books_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs)
  368. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) expect(page).not_to have_css('a', class: 'view_more hidden', id: 'view_more') ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 752f0c0 (Featire specs) ======= expect(page).not_to have_css('a', class: 'view_more hidden', id: 'view_more') >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs)
  369. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs)
  370. 1 expect(page).not_to have_css('a', class: 'view_more hidden', id: 'view_more')
  371. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) end
  372. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  373. =======
  374. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  375. >>>>>>> 752f0c0 (Featire specs) =======
  376. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
  377. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs)
  378. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  379. 1 context 'when view more' do
  380. 1 it 'show books with view more button' do
  381. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  382. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) visit books_path ======= context 'when view more' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= context 'when view more' do >>>>>>> 752f0c0 (Featire specs) ======= visit books_path >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= context 'when view more' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs)
  383. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  384. =======
  385. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) =======
  386. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD =======
  387. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= it 'show books with view more button' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= it 'show books with view more button' do >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= it 'show books with view more button' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs)
  388. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) expect(page).to have_css('a', class: 'view_more') ======= visit books_path >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= visit books_path >>>>>>> 752f0c0 (Featire specs) ======= expect(page).to have_css('a', class: 'view_more') >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= visit books_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs)
  389. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs)
  390. 1 expect(page).to have_css('a', class: 'view_more')
  391. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) end
  392. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  393. =======
  394. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  395. >>>>>>> 752f0c0 (Featire specs) =======
  396. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
  397. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs)
  398. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  399. =======
  400. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  401. >>>>>>> 752f0c0 (Featire specs) =======
  402. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
  403. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) 1 it 'show loaded books', js: true do
  404. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  405. 1 visit books_path
  406. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  407. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) find('a', class: 'view_more').click ======= visit books_path >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= visit books_path >>>>>>> 752f0c0 (Featire specs) ======= find('a', class: 'view_more').click >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= visit books_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs)
  408. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) expect(page).to have_content(books.last.title) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 752f0c0 (Featire specs) ======= expect(page).to have_content(books.last.title) >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs)
  409. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) end ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= end >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs)
  410. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  411. =======
  412. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) =======
  413. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD =======
  414. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) end ======= expect(page).to have_content(books.last.title) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= expect(page).to have_content(books.last.title) >>>>>>> 752f0c0 (Featire specs) ======= end >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= expect(page).to have_content(books.last.title) >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs)
  415. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) end ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= end >>>>>>> 752f0c0 (Featire specs) ======= end >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs)
  416. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) end
  417. end
  418. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs)
  419. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  420. =======
  421. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  422. >>>>>>> 752f0c0 (Featire specs) =======
  423. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
  424. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) 1 describe 'sort' do
  425. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  426. =======
  427. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  428. >>>>>>> 752f0c0 (Featire specs) =======
  429. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
  430. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) 1 shared_examples 'sort test' do
  431. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  432. =======
  433. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  434. >>>>>>> 752f0c0 (Featire specs) =======
  435. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
  436. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) 5 it 'sort books' do
  437. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  438. 5 create(:book, title: 'Zimbabwe', price_cents: 75,
  439. created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
  440. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  441. 5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) create(:book, title: 'Anna', price_cents: 23, ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 752f0c0 (Featire specs) ======= create(:book, title: 'Anna', price_cents: 23, >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs)
  442. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 752f0c0 (Featire specs) ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 4e81ea2 (Featire specs) ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> af057e3 (Featire specs) created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> 872e675 (Fix) ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs)
  443. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs)
  444. ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD =======
  445. ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  446. 5 FactoryBot.create(:book, title: 'Anna', price: 23, created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
  447. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) =======
  448. >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs)
  449. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  450. =======
  451. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  452. >>>>>>> 752f0c0 (Featire specs) =======
  453. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
  454. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) 5 visit books_path
  455. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  456. =======
  457. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  458. >>>>>>> 752f0c0 (Featire specs) =======
  459. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
  460. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs)
  461. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  462. =======
  463. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  464. >>>>>>> 752f0c0 (Featire specs) =======
  465. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
  466. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) 5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) find('a', class: 'dropdown-toggle lead small', text: I18n.t('catalog_page.sorting.newer_first'),
  467. id: 'menu').click <<<<<<< HEAD <<<<<<< HEAD ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> d0dc1f1 (Featire specs) ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
  468. 5 within 'ul', class: 'dropdown-menu', id: 'sort' do
  469. 5 click_link button
  470. end
  471. 5 expect(find('.col-xs-6.col-sm-3', match: :first)).to have_content(book_title)
  472. end
  473. end
  474. 1 context 'when sort by title A to Z' do
  475. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) let(:button) { I18n.t('catalog_page.sorting.title.asc') } ======= let(:button) { 'Title: A to Z' } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= let(:button) { 'Title: A to Z' } >>>>>>> 752f0c0 (Featire specs) ======= let(:button) { I18n.t('catalog_page.sorting.title.asc') } >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= let(:button) { 'Title: A to Z' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs)
  476. 2 let(:book_title) { 'Anna' }
  477. 1 include_examples 'sort test'
  478. end
  479. 1 context 'when sort by title Z to A' do
  480. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) let(:button) { I18n.t('catalog_page.sorting.title.desc') } ======= let(:button) { 'Title: Z to A' } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= let(:button) { 'Title: Z to A' } >>>>>>> 752f0c0 (Featire specs) ======= let(:button) { I18n.t('catalog_page.sorting.title.desc') } >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= let(:button) { 'Title: Z to A' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs)
  481. 2 let(:book_title) { 'Zimbabwe' }
  482. 1 include_examples 'sort test'
  483. end
  484. 1 context 'when sort by price High to Low' do
  485. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) let(:button) { I18n.t('catalog_page.sorting.price.desc') } ======= let(:button) { 'Price: High to Low' } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= let(:button) { 'Price: High to Low' } >>>>>>> 752f0c0 (Featire specs) ======= let(:button) { I18n.t('catalog_page.sorting.price.desc') } >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= let(:button) { 'Price: High to Low' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs)
  486. 2 let(:book_title) { 'Zimbabwe' }
  487. 1 include_examples 'sort test'
  488. end
  489. 1 context 'when sort by price Low to High' do
  490. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) let(:button) { I18n.t('catalog_page.sorting.price.asc') } ======= let(:button) { 'Price: Low to High' } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= let(:button) { 'Price: Low to High' } >>>>>>> 752f0c0 (Featire specs) ======= let(:button) { I18n.t('catalog_page.sorting.price.asc') } >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= let(:button) { 'Price: Low to High' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs)
  491. 2 let(:book_title) { 'Anna' }
  492. 1 include_examples 'sort test'
  493. end
  494. 1 context 'when sort by newest' do
  495. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) let(:button) { I18n.t('catalog_page.sorting.newer_first') } ======= let(:button) { 'Newest first' } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= let(:button) { 'Newest first' } >>>>>>> 752f0c0 (Featire specs) ======= let(:button) { I18n.t('catalog_page.sorting.newer_first') } >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= let(:button) { 'Newest first' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs)
  496. 2 let(:book_title) { 'Zimbabwe' }
  497. 1 include_examples 'sort test'
  498. end
  499. end
  500. end

spec/feature/home_spec.rb

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) 49 relevant lines. 49 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe 'Home', type: :feature do
  2. 1 include_context 'with api request authentication helper methods'
  3. 1 include_context 'with api request global before and after hooks'
  4. 1 describe 'Get Started' do
  5. 1 it 'on click move to catalog page' do
  6. 1 visit root_path
  7. 1 click_on 'Get Started'
  8. 1 expect(page).to have_content('Catalog')
  9. end
  10. end
  11. 1 describe 'navbar' do
  12. 2 let(:books_category) { create(:books_category) }
  13. 1 it 'on click home move to root-path' do
  14. 1 visit books_path
  15. 1 find('a', id: 'root').click
  16. 1 expect(page).to have_content('Get Started')
  17. end
  18. 1 it 'on click category name move to root-path with books that belong to this category' do
  19. 1 books_category
  20. 1 visit root_path
  21. 1 find('a', class: 'dropdown-toggle', text: 'Shop').click
  22. 1 within('ul', id: 'nav') do
  23. 1 find('a', class: 'collapse-link', text: books_category.category.name).click
  24. end
  25. 1 expect(page).to have_content(books_category.category.books.first.title)
  26. end
  27. 1 context 'when guest' do
  28. 1 it 'on click login go to login page' do
  29. 1 visit root_path
  30. 1 within 'div', class: 'visible-xs' do
  31. 1 click_link I18n.t('header.log_in')
  32. end
  33. 1 expect(page).to have_content(I18n.t('header.log_in'))
  34. end
  35. 1 it 'on click sing up go to sing up page' do
  36. 1 visit root_path
  37. 1 within 'div', class: 'visible-xs' do
  38. 1 click_link I18n.t('header.sing_up')
  39. end
  40. 1 expect(page).to have_content(I18n.t('header.sing_up'))
  41. end
  42. end
  43. 1 context 'when user', js: true do
  44. 4 let(:user) { create(:user) }
  45. 1 before do
  46. 3 sign_in(user)
  47. end
  48. 1 it 'on click account show settings' do
  49. 1 visit root_path
  50. 1 click_on I18n.t('header.account')
  51. 1 expect(page).to have_content(I18n.t('header.settings'))
  52. end
  53. 1 it 'on click account show log_out' do
  54. 1 visit root_path
  55. 1 click_on I18n.t('header.account')
  56. 1 expect(page).to have_content(I18n.t('header.log_out'))
  57. end
  58. 1 it 'log_out' do
  59. 1 visit root_path
  60. 1 click_on I18n.t('header.account')
  61. 1 click_on(I18n.t('header.log_out'), match: :first)
  62. 1 expect(page).to have_content(I18n.t('devise.sessions.signed_out'))
  63. end
  64. end
  65. end
  66. end

spec/feature/login_spec.rb

>>>>>>> a5d032d (Fix) 100.0% lines covered

<<<<<<< HEAD 31 relevant lines. 31 lines covered and ======= 19 relevant lines. 19 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe 'Login', type: :feature do
  2. 3 let(:user_second) { create(:user, email: 'test.rspec@rspec.ua') }
  3. 1 describe '#login' do
  4. 1 before do
  5. 2 visit new_user_session_path
  6. end
  7. 1 context 'when successfully login' do
  8. 1 it 'login' do
  9. 1 within 'form', class: 'new_user', id: 'new_user' do
  10. 1 fill_in 'user_email', with: user_second.email
  11. 1 fill_in 'user_password', with: user_second.password
  12. 1 click_on I18n.t('header.log_in')
  13. end
  14. 1 expect(page).to have_text I18n.t('devise.sessions.signed_in')
  15. end
  16. end
  17. 1 context 'when unsuccessfully login' do
  18. 1 it 'didn`t login' do
  19. 1 within 'form', class: 'new_user', id: 'new_user' do
  20. 1 fill_in 'user_email', with: user_second.email
  21. 1 fill_in 'user_password', with: 'wrong_password'
  22. 1 click_on I18n.t('header.log_in')
  23. end
  24. 1 expect(page).to have_text 'Invalid Email or password.'
  25. end
  26. end
  27. end
  28. end

spec/feature/new_password_spec.rb

100.0% lines covered

13 relevant lines. 13 lines covered and 0 lines missed.
    
  1. 1 require_relative '../rails_helper'
  2. 1 require_relative '../support/shared_context'
  3. 1 RSpec.describe 'New Password', type: :feature do
  4. 3 let(:user) { FactoryBot.create(:user) }
  5. 1 describe '#new_password' do
  6. 1 it 'change password' do
  7. 1 user.reset_password('newPassword', 'newPassword')
  8. 1 expect(user.password).to eq('newPassword')
  9. end
  10. 1 it 'not validate password' do
  11. 1 visit new_user_password_path
  12. 1 fill_in 'email', with: user.email
  13. 1 click_on I18n.t('login.send_instructions')
  14. 1 expect(page).to have_content(I18n.t('devise.passwords.send_instructions'))
  15. end
  16. end
  17. end

spec/feature/registration_spec.rb

100.0% lines covered

29 relevant lines. 29 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe 'Registration', type: :feature do
  2. 3 let(:user) { create(:user, email: 'test.rspec@rspec.ua') }
  3. 1 describe '#sing_up' do
  4. 1 before do
  5. 3 visit new_user_registration_path
  6. end
  7. 1 context 'when successfully sing_up' do
  8. 1 it 'sing_up users' do
  9. 1 within 'form', class: 'new_user', id: 'new_user' do
  10. 1 fill_in 'user_email', with: 'email-test@rspec.com'
  11. 1 fill_in 'user_password', with: user.password
  12. 1 fill_in 'user_password_confirmation', with: user.password
  13. 1 click_on I18n.t('header.sing_up')
  14. end
  15. 1 expect(page).to have_text I18n.t('devise.registrations.signed_up_but_unconfirmed')
  16. end
  17. end
  18. 1 context 'when users is already exits' do
  19. 1 it 'sing_up users' do
  20. 1 within 'form', class: 'new_user', id: 'new_user' do
  21. 1 fill_in 'user_email', with: user.email
  22. 1 fill_in 'user_password', with: user.password
  23. 1 fill_in 'user_password_confirmation', with: user.password
  24. 1 click_on I18n.t('header.sing_up')
  25. end
  26. 1 expect(page).to have_text('Email has already been taken')
  27. end
  28. end
  29. 1 context 'when unsuccessfully sing_up' do
  30. 1 it 'didn`t sing_up' do
  31. 1 within 'form', class: 'new_user', id: 'new_user' do
  32. 1 fill_in 'user_email', with: FFaker::Internet.email
  33. 1 fill_in 'user_password', with: 'password'
  34. 1 fill_in 'user_password_confirmation', with: 'wrong'
  35. 1 click_on I18n.t('header.sing_up')
  36. end
  37. 1 expect(page).to have_text '1 error prohibited this user from being saved'
  38. end
  39. end
  40. end
  41. end

spec/feature/review_spec.rb

100.0% lines covered

28 relevant lines. 28 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe 'Review', type: :feature do
  2. 1 include_context 'with api request authentication helper methods'
  3. 1 include_context 'with api request global before and after hooks'
  4. 3 let(:user) { create(:user).decorate }
  5. 3 let(:book) { create(:book).decorate }
  6. 1 before do
  7. 2 sign_in(user)
  8. 2 visit book_path(book)
  9. end
  10. 1 shared_examples 'review' do
  11. 2 it 'review' do
  12. 2 find('i', id: rating).click
  13. 2 fill_in :title, with: FFaker::Lorem.sentence(title_words)
  14. 2 fill_in :body, with: FFaker::Lorem.sentence(body_words)
  15. 2 click_on I18n.t('review.post')
  16. 2 expect(page).to have_content(result)
  17. end
  18. end
  19. 1 describe '#post review', js: true do
  20. 1 context 'when review posted' do
  21. 2 let(:rating) { "star#{rand(1..5)}" }
  22. 2 let(:title_words) { 3 }
  23. 2 let(:body_words) { 5 }
  24. 2 let(:result) { user.name_or_email }
  25. 1 include_examples 'review'
  26. end
  27. 1 context 'when review not been posted' do
  28. 2 let(:rating) { "star#{rand(1..5)}" }
  29. 2 let(:title_words) { 80 }
  30. 2 let(:body_words) { 30 }
  31. 2 let(:result) { 'Title is too long (maximum is 80 characters)' }
  32. 1 include_examples 'review'
  33. end
  34. end
  35. end

spec/feature/settings_spec.rb

100.0% lines covered

34 relevant lines. 34 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe 'Settings', type: :feature do
  2. 1 include_context 'with api request authentication helper methods'
  3. 1 include_context 'with api request global before and after hooks'
  4. 4 let(:user) { create(:user) }
  5. 1 before do
  6. 3 sign_in(user)
  7. 3 visit edit_user_path(user.id)
  8. 3 click_link I18n.t('settings.privacy')
  9. end
  10. 1 describe '#email_change' do
  11. 1 it 'change email' do
  12. 1 within('div', id: 'email') do
  13. 1 fill_in :email, with: FFaker::Internet.email
  14. 1 click_on I18n.t('settings.save')
  15. end
  16. 1 user.confirm
  17. 1 expect(page).to have_content(I18n.t('settings.message.update'))
  18. end
  19. end
  20. 1 describe '#password_change' do
  21. 1 context 'when error' do
  22. 1 it 'didnt change password' do
  23. 1 within('div', id: 'password') do
  24. 1 fill_in :current_password, with: user.password
  25. 1 fill_in :password, with: 'newPassword'
  26. 1 fill_in :password_confirmation, with: 'incorrectPassword'
  27. 1 click_on I18n.t('settings.save')
  28. end
  29. 1 user.confirm
  30. 1 expect(page).to have_content(I18n.t('settings.error.error'))
  31. end
  32. end
  33. 1 context 'when successful' do
  34. 1 it 'didnt change password' do
  35. 1 within('div', id: 'password') do
  36. 1 fill_in :current_password, with: user.password
  37. 1 fill_in :password, with: 'newPassword'
  38. 1 fill_in :password_confirmation, with: 'newPassword'
  39. 1 click_on I18n.t('settings.save')
  40. end
  41. 1 user.confirm
  42. 1 expect(page).to have_content(I18n.t('devise.failure.unauthenticated'))
  43. end
  44. end
  45. end
  46. end

spec/feature/shipping_spec.rb

73.08% lines covered

26 relevant lines. 19 lines covered and 7 lines missed.
    
  1. 1 RSpec.describe 'Shipping', type: :feature do
  2. 1 include_context 'with api request authentication helper methods'
  3. 1 include_context 'with api request global before and after hooks'
  4. 2 let(:user) { FactoryBot.create(:user) }
  5. 1 let(:attributes_for) { attributes_for(:shipping) }
  6. 1 describe '#fill_in', js: true do
  7. 1 it 'fill in shipping' do
  8. 1 sign_in(user)
  9. 1 visit edit_user_path(user.id)
  10. 1 within('div#shipping.col-md-5.mb-40') do
  11. 1 find_all('div', class: 'form-group')[0] do
  12. fill_in :first_name, with: attributes_for[:first_name]
  13. end
  14. 1 find_all('div', class: 'form-group')[1] do
  15. fill_in :last_name, with: attributes_for[:last_name]
  16. end
  17. 1 find_all('div', class: 'form-group')[2] do
  18. fill_in :address, with: attributes_for[:address]
  19. end
  20. 1 find_all('div', class: 'form-group')[3] do
  21. fill_in :city, with: attributes_for[:city]
  22. end
  23. 1 find_all('div', class: 'form-group')[4] do
  24. fill_in :zip, with: attributes_for[:zip]
  25. end
  26. 1 find_all('div', class: 'form-group')[5] do
  27. fill_in :country, with: attributes_for[:country]
  28. end
  29. 1 find_all('div', class: 'form-group')[6] do
  30. fill_in :phone, with: attributes_for[:phone]
  31. end
  32. 1 click_on I18n.t('settings.save')
  33. end
  34. 1 expect(page).to have_content(I18n.t('settings.message.update'))
  35. end
  36. end
  37. end

spec/feature/user_spec.rb

100.0% lines covered

42 relevant lines. 42 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe 'User', type: :feature do
  2. 2 let(:user) { build(:user, email: 'test.rspec@rspec.ua') }
  3. 3 let(:user_second) { create(:user, email: 'test.rspec-test@rspec.ua') }
  4. 1 describe '#sing_up' do
  5. 1 context 'when successfully sing_up' do
  6. 1 before do
  7. 1 visit new_user_registration_path
  8. 1 within 'form', class: 'new_user', id: 'new_user' do
  9. 1 fill_in 'user_email', with: user.email
  10. 1 fill_in 'user_password', with: user.password
  11. 1 fill_in 'user_password_confirmation', with: user.password
  12. 1 click_on I18n.t('header.sing_up')
  13. end
  14. end
  15. 1 it 'sing_up user' do
  16. 1 expect(page).to have_text I18n.t('devise.registrations.signed_up_but_unconfirmed')
  17. end
  18. end
  19. 1 context 'when unsuccessfully sing_up' do
  20. 1 it 'didn`t sing_up' do
  21. 1 visit new_user_registration_path
  22. 1 within 'form', class: 'new_user', id: 'new_user' do
  23. 1 fill_in 'user_email', with: FFaker::Internet.email
  24. 1 fill_in 'user_password', with: 'wrong'
  25. 1 fill_in 'user_password_confirmation', with: 'wrong'
  26. 1 click_on I18n.t('header.sing_up')
  27. end
  28. 1 expect(page).to have_text '1 error prohibited this user from being saved'
  29. end
  30. end
  31. end
  32. 1 describe '#login' do
  33. 1 before do
  34. 2 user_second.confirm
  35. end
  36. 1 context 'when successfully login' do
  37. 1 it 'login' do
  38. 1 visit new_user_session_path
  39. 1 within 'form', class: 'new_user', id: 'new_user' do
  40. 1 fill_in 'user_email', with: user_second.email
  41. 1 fill_in 'user_password', with: user_second.password
  42. 1 click_on I18n.t('header.log_in')
  43. end
  44. 1 expect(page).to have_text I18n.t('devise.sessions.signed_in')
  45. end
  46. end
  47. 1 context 'when unsuccessfully login' do
  48. 1 it 'didn`t login' do
  49. 1 visit new_user_session_path
  50. 1 within 'form', class: 'new_user', id: 'new_user' do
  51. 1 fill_in 'user_email', with: user_second.email
  52. 1 fill_in 'user_password', with: 'wrong_password'
  53. 1 click_on I18n.t('header.log_in')
  54. end
  55. 1 expect(page).to have_text 'Invalid Email or password.'
  56. end
  57. end
  58. end
  59. end

spec/models/admin_user_spec.rb

100.0% lines covered

5 relevant lines. 5 lines covered and ======= 20 relevant lines. 20 lines covered and >>>>>>> d0dc1f1 (Featire specs) ======= 20 relevant lines. 20 lines covered and >>>>>>> 752f0c0 (Featire specs) 0 lines missed.
    
  1. 1 require 'rails_helper'
  2. 1 <<<<<<< HEAD <<<<<<< HEAD RSpec.describe AdminUser, type: :model do ======= RSpec.describe 'Homes', type: :feature do >>>>>>> d0dc1f1 (Featire specs) ======= RSpec.describe 'Homes', type: :feature do >>>>>>> 752f0c0 (Featire specs)
  3. 1 <<<<<<< HEAD <<<<<<< HEAD context 'when validations' do ======= describe 'Get Started' do >>>>>>> d0dc1f1 (Featire specs) ======= describe 'Get Started' do >>>>>>> 752f0c0 (Featire specs)
  4. <<<<<<< HEAD <<<<<<< HEAD
  5. 2 =======
  6. 1 >>>>>>> d0dc1f1 (Featire specs) =======
  7. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD it { is_expected.to validate_presence_of(:email) } ======= it 'on click move to catalog page' do >>>>>>> d0dc1f1 (Featire specs) ======= it 'on click move to catalog page' do >>>>>>> 752f0c0 (Featire specs)
  8. <<<<<<< HEAD <<<<<<< HEAD
  9. 2 =======
  10. 1 >>>>>>> d0dc1f1 (Featire specs) =======
  11. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD it { is_expected.to validate_presence_of(:password) } ======= visit root_path >>>>>>> d0dc1f1 (Featire specs) ======= visit root_path >>>>>>> 752f0c0 (Featire specs)
  12. <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs)
  13. 1 click_on 'Get Started'
  14. 1 expect(page).to have_content('Catalog')
  15. end
  16. <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) end
  17. <<<<<<< HEAD <<<<<<< HEAD
  18. ======= ======= >>>>>>> 752f0c0 (Featire specs)
  19. 1 describe 'navbar' do
  20. 2 let(:books_category) { FactoryBot.create(:books_category) }
  21. 1 it 'on click home move to root-path' do
  22. 1 visit books_path
  23. 1 find('a', id: 'root').click
  24. 1 expect(page).to have_content('Get Started')
  25. end
  26. 1 it 'on click category name move to root-path with books that belong to this category' do
  27. 1 books_category
  28. 1 visit root_path
  29. 1 find('a', class: 'dropdown-toggle', text: 'Shop').click
  30. 1 within('ul', id: 'nav') do
  31. 1 find('a', class: 'collapse-link', text: books_category.category.name).click
  32. end
  33. 1 expect(page).to have_content(books_category.category.books.first.title)
  34. end
  35. end
  36. <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) end

spec/models/author_spec.rb

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD 8 relevant lines. 8 lines covered and ======= 9 relevant lines. 9 lines covered and >>>>>>> d0dc1f1 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 752f0c0 (Featire specs) 0 lines missed.
    
  1. 1 <<<<<<< HEAD <<<<<<< HEAD RSpec.describe Author, type: :model do ======= require 'rails_helper' >>>>>>> d0dc1f1 (Featire specs) ======= require 'rails_helper' >>>>>>> 752f0c0 (Featire specs)
  2. <<<<<<< HEAD <<<<<<< HEAD
  3. 1 describe 'author' do
  4. 1 context 'when validations' do
  5. 2 it { is_expected.to validate_presence_of(:first_name) }
  6. 2 it { is_expected.to validate_presence_of(:last_name) }
  7. end
  8. =======
  9. >>>>>>> d0dc1f1 (Featire specs) =======
  10. >>>>>>> 752f0c0 (Featire specs)
  11. <<<<<<< HEAD <<<<<<< HEAD
  12. =======
  13. >>>>>>> d0dc1f1 (Featire specs) =======
  14. >>>>>>> 752f0c0 (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD context 'when associations' do ======= RSpec.describe Author, type: :model do >>>>>>> d0dc1f1 (Featire specs) ======= RSpec.describe Author, type: :model do >>>>>>> 752f0c0 (Featire specs)
  15. <<<<<<< HEAD <<<<<<< HEAD
  16. ======= ======= >>>>>>> 752f0c0 (Featire specs)
  17. 1 describe 'author' do
  18. 1 context 'when validations' do
  19. <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) 2 <<<<<<< HEAD <<<<<<< HEAD it { is_expected.to have_many(:authors_books).dependent(:destroy) } ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> 752f0c0 (Featire specs)
  20. <<<<<<< HEAD <<<<<<< HEAD
  21. =======
  22. >>>>>>> d0dc1f1 (Featire specs) =======
  23. >>>>>>> 752f0c0 (Featire specs) 2 <<<<<<< HEAD <<<<<<< HEAD it { is_expected.to have_many(:books).through(:authors_books) } ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> 752f0c0 (Featire specs)
  24. <<<<<<< HEAD <<<<<<< HEAD
  25. =======
  26. >>>>>>> d0dc1f1 (Featire specs) =======
  27. >>>>>>> 752f0c0 (Featire specs) end
  28. <<<<<<< HEAD <<<<<<< HEAD
  29. ======= ======= >>>>>>> 752f0c0 (Featire specs)
  30. 1 context 'when associations' do
  31. 2 it { is_expected.to have_many(:authors_books).dependent(:destroy) }
  32. 2 it { is_expected.to have_many(:books).through(:authors_books) }
  33. end
  34. <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) end
  35. <<<<<<< HEAD <<<<<<< HEAD
  36. =======
  37. >>>>>>> d0dc1f1 (Featire specs) =======
  38. >>>>>>> 752f0c0 (Featire specs) end

spec/models/authors_book_spec.rb

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD 8 relevant lines. 8 lines covered and ======= 9 relevant lines. 9 lines covered and >>>>>>> d0dc1f1 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 752f0c0 (Featire specs) 0 lines missed.
    
  1. 1 <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) require 'rails_helper'
  2. 1 <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) RSpec.describe AuthorsBook, type: :model do
  3. <<<<<<< HEAD <<<<<<< HEAD
  4. =======
  5. >>>>>>> d0dc1f1 (Featire specs) =======
  6. >>>>>>> 752f0c0 (Featire specs) 1 describe 'authors_book' do
  7. <<<<<<< HEAD <<<<<<< HEAD
  8. =======
  9. >>>>>>> d0dc1f1 (Featire specs) =======
  10. >>>>>>> 752f0c0 (Featire specs) 1 context 'when validations' do
  11. <<<<<<< HEAD <<<<<<< HEAD
  12. 2 it { is_expected.to validate_presence_of(:book) }
  13. 2 it { is_expected.to validate_presence_of(:author) }
  14. end
  15. 1 context 'when associations' do
  16. 2 it { is_expected.to belong_to(:author) }
  17. 2 it { is_expected.to belong_to(:book) }
  18. end
  19. end
  20. end

spec/models/billing_spec.rb

100.0% lines covered

20 relevant lines. 20 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe Billing, type: :model do
  2. 1 describe 'billing' do
  3. 1 context 'when validations' do
  4. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:first_name) }
  5. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:last_name) }
  6. ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs)
  7. 2 <<<<<<< HEAD <<<<<<< HEAD it { is_expected.to allow_values('+919367788755', '8989829304', '+16308520397', '786-307-3615').for(:phone) } ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 752f0c0 (Featire specs)
  8. 2 <<<<<<< HEAD <<<<<<< HEAD it { is_expected.to allow_values(FFaker::AddressUK.country).for(:country) } ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> 752f0c0 (Featire specs)
  9. <<<<<<< HEAD <<<<<<< HEAD
  10. 2 it { is_expected.to allow_values(FFaker::AddressUK.city).for(:city) }
  11. 2 it { is_expected.to allow_values(FFaker::AddressUA.zip_code).for(:zip) }
  12. 2 it { is_expected.to allow_values(FFaker::Address.street_address).for(:address) }
  13. =======
  14. >>>>>>> d0dc1f1 (Featire specs) =======
  15. >>>>>>> 752f0c0 (Featire specs) end
  16. <<<<<<< HEAD <<<<<<< HEAD
  17. =======
  18. >>>>>>> d0dc1f1 (Featire specs) =======
  19. >>>>>>> 752f0c0 (Featire specs)
  20. <<<<<<< HEAD <<<<<<< HEAD
  21. 1 context 'when not validations' do
  22. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:first_name) }
  23. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:last_name) }
  24. 2 it { is_expected.not_to allow_values('789', '123765', '1-1-1', '+982').for(:phone) }
  25. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:country) }
  26. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:city) }
  27. 2 it { is_expected.not_to allow_values('1' * Constants::VALIDATES_ZIP_LENGTH_MAX.next).for(:zip) }
  28. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:address) }
  29. end
  30. =======
  31. >>>>>>> d0dc1f1 (Featire specs) =======
  32. >>>>>>> 752f0c0 (Featire specs) 1 context 'when associations' do
  33. <<<<<<< HEAD <<<<<<< HEAD
  34. =======
  35. >>>>>>> d0dc1f1 (Featire specs) =======
  36. >>>>>>> 752f0c0 (Featire specs) 2 <<<<<<< HEAD <<<<<<< HEAD it { is_expected.to belong_to(:user) } ======= it { is_expected.to belong_to(:author) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to belong_to(:author) } >>>>>>> 752f0c0 (Featire specs)
  37. <<<<<<< HEAD <<<<<<< HEAD
  38. ======= ======= >>>>>>> 752f0c0 (Featire specs)
  39. 2 it { is_expected.to belong_to(:book) }
  40. <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) end
  41. <<<<<<< HEAD <<<<<<< HEAD
  42. =======
  43. >>>>>>> d0dc1f1 (Featire specs) =======
  44. >>>>>>> 752f0c0 (Featire specs) end
  45. <<<<<<< HEAD <<<<<<< HEAD
  46. =======
  47. >>>>>>> d0dc1f1 (Featire specs) =======
  48. >>>>>>> 752f0c0 (Featire specs) end

spec/models/book_spec.rb

100.0% lines covered

16 relevant lines. 16 lines covered and 0 lines missed.
    
  1. 1 <<<<<<< HEAD <<<<<<< HEAD RSpec.describe Book, type: :model do ======= require 'rails_helper' >>>>>>> d0dc1f1 (Featire specs) ======= require 'rails_helper' >>>>>>> 752f0c0 (Featire specs)
  2. <<<<<<< HEAD <<<<<<< HEAD
  3. 1 =======
  4. >>>>>>> d0dc1f1 (Featire specs) =======
  5. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD describe 'books' do ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs)
  6. 1 <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) RSpec.describe Book, type: :model do
  7. 1 describe 'books' do
  8. 1 <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) context 'when validations' do
  9. <<<<<<< HEAD <<<<<<< HEAD
  10. 2 it { is_expected.to validate_presence_of(:title) }
  11. 2 it { is_expected.to validate_presence_of(:description) }
  12. ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs)
  13. 2 <<<<<<< HEAD <<<<<<< HEAD it { is_expected.to allow_values(Constants::MIN_PRICE_IN_CENTS, Constants::MAX_PRICE_IN_CENTS).for(:price_cents) } ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> 752f0c0 (Featire specs)
  14. 2 <<<<<<< HEAD <<<<<<< HEAD it { is_expected.to validate_presence_of(:year_of_publication) } ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> 752f0c0 (Featire specs)
  15. 2 <<<<<<< HEAD <<<<<<< HEAD it { is_expected.to validate_presence_of(:quantity) } ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> 752f0c0 (Featire specs)
  16. 2 <<<<<<< HEAD <<<<<<< HEAD it { is_expected.to validate_presence_of(:materials) } ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> 752f0c0 (Featire specs)
  17. 2 <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) it { is_expected.to validate_presence_of(:quantity) }
  18. 2 it { is_expected.to validate_presence_of(:materials) }
  19. 2 <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) it { is_expected.to validate_presence_of(:dimensions) }
  20. <<<<<<< HEAD <<<<<<< HEAD
  21. =======
  22. >>>>>>> d0dc1f1 (Featire specs) =======
  23. >>>>>>> 752f0c0 (Featire specs) end
  24. <<<<<<< HEAD <<<<<<< HEAD
  25. =======
  26. >>>>>>> d0dc1f1 (Featire specs) =======
  27. >>>>>>> 752f0c0 (Featire specs)
  28. <<<<<<< HEAD <<<<<<< HEAD
  29. =======
  30. >>>>>>> d0dc1f1 (Featire specs) =======
  31. >>>>>>> 752f0c0 (Featire specs) 1 context 'when associations' do
  32. <<<<<<< HEAD <<<<<<< HEAD
  33. =======
  34. >>>>>>> d0dc1f1 (Featire specs) =======
  35. >>>>>>> 752f0c0 (Featire specs) 2 it { is_expected.to have_many(:authors_books).dependent(:destroy) }
  36. <<<<<<< HEAD <<<<<<< HEAD
  37. =======
  38. >>>>>>> d0dc1f1 (Featire specs) =======
  39. >>>>>>> 752f0c0 (Featire specs) 2 it { is_expected.to have_many(:authors).through(:authors_books) }
  40. <<<<<<< HEAD <<<<<<< HEAD
  41. =======
  42. >>>>>>> d0dc1f1 (Featire specs) =======
  43. >>>>>>> 752f0c0 (Featire specs)
  44. <<<<<<< HEAD <<<<<<< HEAD
  45. =======
  46. >>>>>>> d0dc1f1 (Featire specs) =======
  47. >>>>>>> 752f0c0 (Featire specs) 2 it { is_expected.to have_many(:books_categories).dependent(:destroy) }
  48. <<<<<<< HEAD <<<<<<< HEAD
  49. 2 it { is_expected.to have_many(:categories).through(:books_categories) }
  50. ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs)
  51. 2 <<<<<<< HEAD <<<<<<< HEAD it { is_expected.to have_many(:reviews).dependent(:destroy) } ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> 752f0c0 (Featire specs)
  52. end
  53. end
  54. end

spec/models/books_category_spec.rb

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD 8 relevant lines. 8 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe BooksCategory, type: :model do
  2. 1 describe 'books_categories' do
  3. 1 context 'when validations' do
  4. 2 it { is_expected.to validate_presence_of(:book) }
  5. 2 it { is_expected.to validate_presence_of(:category) }
  6. end
  7. 1 context 'when associations' do
  8. 2 it { is_expected.to belong_to(:category) }
  9. 2 it { is_expected.to belong_to(:book) }
  10. end
  11. end
  12. end

spec/models/category_spec.rb

100.0% lines covered

7 relevant lines. 7 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe Category, type: :model do
  2. 1 describe 'category' do
  3. 1 context 'when validations' do
  4. 2 it { is_expected.to validate_presence_of(:name) }
  5. end
  6. 1 context 'when associations' do
  7. 2 it { is_expected.to have_many(:books_categories).dependent(:destroy) }
  8. 2 it { is_expected.to have_many(:books).through(:books_categories) }
  9. end
  10. end
  11. end

spec/models/review_spec.rb

100.0% lines covered

14 relevant lines. 14 lines covered and ======= 9 relevant lines. 9 lines covered and >>>>>>> d0dc1f1 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 752f0c0 (Featire specs) 0 lines missed.
    
  1. 1 require 'rails_helper'
  2. 1 <<<<<<< HEAD <<<<<<< HEAD RSpec.describe Review, type: :model do ======= RSpec.describe BooksCategory, type: :model do >>>>>>> d0dc1f1 (Featire specs) ======= RSpec.describe BooksCategory, type: :model do >>>>>>> 752f0c0 (Featire specs)
  3. 1 <<<<<<< HEAD <<<<<<< HEAD describe 'review' do ======= describe 'books_categories' do >>>>>>> d0dc1f1 (Featire specs) ======= describe 'books_categories' do >>>>>>> 752f0c0 (Featire specs)
  4. 1 context 'when validations' do
  5. 2 <<<<<<< HEAD <<<<<<< HEAD it { is_expected.to validate_presence_of(:title) } ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 752f0c0 (Featire specs)
  6. 2 <<<<<<< HEAD <<<<<<< HEAD it { is_expected.to validate_presence_of(:body) }
  7. 2 it { is_expected.to validate_presence_of(:rating) }
  8. 2 it { is_expected.to validate_presence_of(:verified) }
  9. 2 it { is_expected.to allow_values('a' * Constants::VALIDATES_TITLE_LENGTH_MAX).for(:title) }
  10. 2 it { is_expected.to allow_values('a' * Constants::VALIDATES_TEXT_LENGTH_MAX).for(:body) }
  11. 2 it { is_expected.to allow_values(1, 2, 3, 4, 5).for(:rating) }
  12. end
  13. 1 context 'when associations' do
  14. 2 it { is_expected.to belong_to(:book) }
  15. 2 it { is_expected.to belong_to(:user) }
  16. end
  17. end
  18. end

spec/models/shipping_spec.rb

100.0% lines covered

20 relevant lines. 20 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe Shipping, type: :model do
  2. 1 describe 'shipping' do
  3. 1 context 'when validations' do
  4. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:first_name) }
  5. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:last_name) }
  6. 2 it { is_expected.to allow_values('+919367788755', '8989829304', '+16308520397', '786-307-3615').for(:phone) }
  7. 2 it { is_expected.to allow_values(FFaker::AddressUK.country).for(:country) }
  8. 2 it { is_expected.to allow_values(FFaker::AddressUK.city).for(:city) }
  9. 2 it { is_expected.to allow_values(FFaker::AddressUA.zip_code).for(:zip) }
  10. 2 it { is_expected.to allow_values(FFaker::Address.street_address).for(:address) }
  11. end
  12. 1 context 'when not validations' do
  13. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:first_name) }
  14. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:last_name) }
  15. 2 it { is_expected.not_to allow_values('789', '123765', '1-1-1', '+982').for(:phone) }
  16. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:country) }
  17. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:city) }
  18. 2 it { is_expected.not_to allow_values('1' * Constants::VALIDATES_ZIP_LENGTH_MAX.next).for(:zip) }
  19. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:address) }
  20. end
  21. 1 context 'when associations' do
  22. 2 it { is_expected.to belong_to(:user) }
  23. end
  24. end
  25. end

spec/models/user_spec.rb

100.0% lines covered

9 relevant lines. 9 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe User, type: :model do
  2. 1 let(:user) { FactoryBot.create(:user) }
  3. 1 describe 'author' do
  4. 1 context 'when validations' do
  5. 2 it { is_expected.to validate_presence_of(:email) }
  6. 2 it { is_expected.to validate_presence_of(:password) } ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> 752f0c0 (Featire specs)
  7. end
  8. 1 <<<<<<< HEAD <<<<<<< HEAD context 'with associations' do ======= context 'when associations' do >>>>>>> d0dc1f1 (Featire specs) ======= context 'when associations' do >>>>>>> 752f0c0 (Featire specs)
  9. 2 <<<<<<< HEAD <<<<<<< HEAD it { is_expected.to have_one(:billing) } ======= it { is_expected.to belong_to(:category) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to belong_to(:category) } >>>>>>> 752f0c0 (Featire specs)
  10. 2 <<<<<<< HEAD <<<<<<< HEAD it { is_expected.to have_one(:shipping) } ======= it { is_expected.to belong_to(:book) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to belong_to(:book) } >>>>>>> 752f0c0 (Featire specs)
  11. end
  12. end
  13. end
<<<<<<< HEAD <<<<<<< HEAD

spec/queryes/book_query_spec.rb

=======

spec/models/category_spec.rb

>>>>>>> d0dc1f1 (Featire specs) =======

spec/models/category_spec.rb

>>>>>>> 752f0c0 (Featire specs)

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD 45 relevant lines. 45 lines covered and ======= 8 relevant lines. 8 lines covered and >>>>>>> d0dc1f1 (Featire specs) ======= 8 relevant lines. 8 lines covered and >>>>>>> 752f0c0 (Featire specs) 0 lines missed.
    
  1. 1 require 'rails_helper'
  2. 1 <<<<<<< HEAD <<<<<<< HEAD RSpec.describe BookQuery do ======= RSpec.describe Category, type: :model do >>>>>>> d0dc1f1 (Featire specs) ======= RSpec.describe Category, type: :model do >>>>>>> 752f0c0 (Featire specs)
  3. 1 <<<<<<< HEAD <<<<<<< HEAD shared_examples 'sort test' do ======= describe 'category' do >>>>>>> d0dc1f1 (Featire specs) ======= describe 'category' do >>>>>>> 752f0c0 (Featire specs)
  4. <<<<<<< HEAD <<<<<<< HEAD
  5. 5 =======
  6. 1 >>>>>>> d0dc1f1 (Featire specs) =======
  7. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD it 'sort' do ======= context 'when validations' do >>>>>>> d0dc1f1 (Featire specs) ======= context 'when validations' do >>>>>>> 752f0c0 (Featire specs)
  8. <<<<<<< HEAD <<<<<<< HEAD
  9. 5 =======
  10. 2 >>>>>>> d0dc1f1 (Featire specs) =======
  11. 2 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD books ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> 752f0c0 (Featire specs)
  12. <<<<<<< HEAD <<<<<<< HEAD
  13. 5 expect(test).to eq(result)
  14. =======
  15. >>>>>>> d0dc1f1 (Featire specs) =======
  16. >>>>>>> 752f0c0 (Featire specs) end
  17. <<<<<<< HEAD <<<<<<< HEAD
  18. ======= ======= >>>>>>> 752f0c0 (Featire specs)
  19. 1 context 'when associations' do
  20. 2 it { is_expected.to have_many(:books_categories).dependent(:destroy) }
  21. 2 it { is_expected.to have_many(:books).through(:books_categories) }
  22. end
  23. <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) end
  24. <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs)
  25. end
<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true)

spec/rails_helper.rb

87.5% lines covered

16 relevant lines. 14 lines covered and 2 lines missed.
    
  1. 1 require 'spec_helper'
  2. 1 ENV['RAILS_ENV'] ||= 'test'
  3. 1 require_relative '../config/environment'
  4. 1 abort('The Rails environment is running in production mode!') if Rails.env.production?
  5. 1 require 'rspec/rails'
  6. 1 require 'shoulda-matchers'
  7. 1 require_relative 'support/configs/shoulda_matcher'
  8. 1 require_relative 'support/configs/capybara'
  9. <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs)
  10. <<<<<<< HEAD <<<<<<< HEAD
  11. 3 =======
  12. >>>>>>> d0dc1f1 (Featire specs) =======
  13. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD let(:titles) { %w[Adam Zimbabwe] } ======= begin >>>>>>> d0dc1f1 (Featire specs) ======= begin >>>>>>> 752f0c0 (Featire specs)
  14. 1 <<<<<<< HEAD <<<<<<< HEAD let(:books_dates) do ======= ActiveRecord::Migration.maintain_test_schema! >>>>>>> d0dc1f1 (Featire specs) ======= ActiveRecord::Migration.maintain_test_schema! >>>>>>> 752f0c0 (Featire specs)
  15. <<<<<<< HEAD <<<<<<< HEAD
  16. 1 =======
  17. >>>>>>> d0dc1f1 (Featire specs) =======
  18. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ['Thu, 25 Aug 2022 15:25:38.761014000 UTC +00:00', 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00'] ======= rescue ActiveRecord::PendingMigrationError => e >>>>>>> d0dc1f1 (Featire specs) ======= rescue ActiveRecord::PendingMigrationError => e >>>>>>> 752f0c0 (Featire specs)
  19. <<<<<<< HEAD <<<<<<< HEAD
  20. =======
  21. >>>>>>> d0dc1f1 (Featire specs) =======
  22. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD end ======= puts e.to_s.strip >>>>>>> d0dc1f1 (Featire specs) ======= puts e.to_s.strip >>>>>>> 752f0c0 (Featire specs)
  23. <<<<<<< HEAD <<<<<<< HEAD
  24. ======= ======= >>>>>>> 752f0c0 (Featire specs)
  25. exit 1
  26. end
  27. <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs)
  28. <<<<<<< HEAD <<<<<<< HEAD
  29. 1 describe 'all books sort' do
  30. 1 context 'when sort by title A to Z' do
  31. ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs)
  32. 1 <<<<<<< HEAD <<<<<<< HEAD let(:books) do ======= RSpec.configure do |config| >>>>>>> d0dc1f1 (Featire specs) ======= RSpec.configure do |config| >>>>>>> 752f0c0 (Featire specs)
  33. 1 <<<<<<< HEAD <<<<<<< HEAD create(:book, title: titles.first) ======= config.fixture_path = "#{::Rails.root}/spec/fixtures" >>>>>>> d0dc1f1 (Featire specs) ======= config.fixture_path = "#{::Rails.root}/spec/fixtures" >>>>>>> 752f0c0 (Featire specs)
  34. 1 <<<<<<< HEAD <<<<<<< HEAD create(:book, title: titles.second) ======= config.use_transactional_fixtures = true >>>>>>> d0dc1f1 (Featire specs) ======= config.use_transactional_fixtures = true >>>>>>> 752f0c0 (Featire specs)
  35. <<<<<<< HEAD <<<<<<< HEAD
  36. end
  37. 2 let(:result) { titles.second }
  38. 2 let(:test) { described_class.query({ sort: 'title DESC' }).first.title }
  39. =======
  40. >>>>>>> d0dc1f1 (Featire specs) =======
  41. >>>>>>> 752f0c0 (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD include_examples 'sort test' ======= config.infer_spec_type_from_file_location! >>>>>>> d0dc1f1 (Featire specs) ======= config.infer_spec_type_from_file_location! >>>>>>> 752f0c0 (Featire specs)
  42. <<<<<<< HEAD <<<<<<< HEAD
  43. end
  44. =======
  45. >>>>>>> d0dc1f1 (Featire specs) =======
  46. >>>>>>> 752f0c0 (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD context 'when sort title Z to A' do ======= config.filter_rails_from_backtrace! >>>>>>> d0dc1f1 (Featire specs) ======= config.filter_rails_from_backtrace! >>>>>>> 752f0c0 (Featire specs)
  47. <<<<<<< HEAD <<<<<<< HEAD
  48. 1 let(:books) do
  49. 1 create(:book, title: titles.first)
  50. 1 create(:book, title: titles.second)
  51. end
  52. 2 let(:result) { titles.first }
  53. 2 let(:test) { described_class.query({ sort: 'title' }).first.title }
  54. 1 include_examples 'sort test'
  55. end
  56. 1 context 'when sort by price High to Low' do
  57. 1 let(:books) do
  58. 1 create(:book, price_cents: 75)
  59. 1 create(:book, price_cents: 23)
  60. end
  61. 2 let(:result) { 75 }
  62. 2 let(:test) { described_class.query({ sort: 'price_cents DESC' }).first.price_cents }
  63. 1 include_examples 'sort test'
  64. end
  65. 1 context 'when sort price Low to High' do
  66. 1 let(:books) do
  67. 1 create(:book, price_cents: 75)
  68. 1 create(:book, price_cents: 23)
  69. end
  70. 2 let(:result) { 23 }
  71. 2 let(:test) { described_class.query({ sort: 'price_cents' }).first.price_cents }
  72. 1 include_examples 'sort test'
  73. end
  74. 1 context 'when sort by Newest' do
  75. 1 let(:books) do
  76. 1 create(:book, created_at: books_dates.first)
  77. 1 create(:book, created_at: books_dates.second)
  78. end
  79. 2 let(:result) { books_dates.first }
  80. 2 let(:test) { described_class.query({ sort: 'created_at DESC' }).first.created_at }
  81. 1 include_examples 'sort test'
  82. end
  83. end
  84. =======
  85. >>>>>>> d0dc1f1 (Featire specs) =======
  86. >>>>>>> 752f0c0 (Featire specs) end

spec/support/configs/capybara.rb

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 36.84% ======= <<<<<<< HEAD 100.0% ======= 36.84% >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= 100.0% >>>>>>> 752f0c0 (Featire specs) ======= 36.84% >>>>>>> bd8bda4 (Manifest_cache true) lines covered

19 relevant lines. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 19 lines covered and >>>>>>> a5d032d (Fix) 0 lines missed. ======= 7 lines covered and 12 lines missed. >>>>>>> 845dac1 (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) 7 lines covered and 12 lines missed. ======= <<<<<<< HEAD 19 lines covered and 0 lines missed. ======= 7 lines covered and 12 lines missed. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1c3ace6 (Manifest_cache true) ======= ======= 19 lines covered and 0 lines missed. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) ======= ======= 7 lines covered and 12 lines missed. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true)
    
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  1. 1 =======
  2. >>>>>>> d0dc1f1 (Featire specs) =======
  3. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD RSpec.describe 'Author' do ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD Capybara.configure do |config| ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs)
  4. <<<<<<< HEAD =======
  5. >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD include_context 'with api request authentication helper methods' ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD config.asset_host = 'http://localhost:3000' ======= Capybara.configure do |config| >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs)
  6. =======
  7. >>>>>>> bd8bda4 (Manifest_cache true) 1 <<<<<<< HEAD include_context 'with api request global before and after hooks'
  8. 2 let(:first_name) { FFaker::Name.first_name }
  9. 2 let(:last_name) { FFaker::Name.last_name }
  10. 2 let(:new_name) { FFaker::Name.first_name }
  11. 2 let(:old_name) { author.first_name }
  12. 4 let(:author) { create(:author) }
  13. 1 before do
  14. 4 sign_in(create(:admin_user), :admin_user)
  15. end
  16. 1 it 'can create an author' do
  17. 1 visit 'admin/authors'
  18. 1 click_link('New Author')
  19. 1 fill_in 'author[first_name]', with: first_name
  20. 1 fill_in 'author[last_name]', with: last_name
  21. 2 expect { click_button('Create Author') }.to change(Author, :count).from(0).to(1)
  22. end
  23. 1 it 'can delete an author' do
  24. 1 author
  25. 1 visit 'admin/authors'
  26. 2 expect { click_link('Delete') }.to change(Author, :count).from(1).to(0)
  27. end
  28. 1 it 'can view an author' do
  29. 1 author
  30. 1 visit 'admin/authors'
  31. 1 click_link('View')
  32. 1 expect(page).to have_content(author.first_name)
  33. end
  34. 1 it 'can edit an author' do
  35. 1 author
  36. 1 visit 'admin/authors'
  37. 1 click_link('Edit')
  38. 1 fill_in 'author[first_name]', with: new_name
  39. 4 expect { click_button('Update Author') }.to change { author.reload.first_name }.from(old_name).to(new_name)
  40. end
  41. end

spec/feature/admin/book_spec.rb

100.0% lines covered

32 relevant lines. 32 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe 'Book' do
  2. 1 include_context 'with api request authentication helper methods'
  3. 1 include_context 'with api request global before and after hooks'
  4. <<<<<<< HEAD ======= =======
  5. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  6. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) =======
  7. >>>>>>> 4e81ea2 (Featire specs) =======
  8. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) =======
  9. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  10. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= =======
  11. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= =======
  12. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
  13. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  14. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= =======
  15. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) 5 <<<<<<< HEAD let(:book) { create(:book) } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) let(:book) { create(:book) } ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= let(:book) { create(:book) } ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) let(:category_one) { FactoryBot.create(:category) }
  16. 3 let(:category_two) { FactoryBot.create(:category) } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8480924 (Featire specs) ======= >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774f (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  17. 1 let(:params) do
  18. <<<<<<< HEAD
  19. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
  20. 1 =======
  21. 4 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) =======
  22. 4 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs)
  23. 4 >>>>>>> 4e81ea2 (Featire specs) =======
  24. 4 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) =======
  25. 4 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  26. 4 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= =======
  27. 4 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
  28. 4 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  29. 4 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= =======
  30. 4 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) { title: FFaker::Book.title,
  31. description: FFaker::Book.description,
  32. <<<<<<< HEAD price_cents: FFaker::Number.rand(1..100), ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) price_cents: FFaker::Number.rand(1..100), ======= price: FFaker::Number.rand(1..100), >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= price: FFaker::Number.rand(1..100), >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= price: FFaker::Number.rand(1..100), >>>>>>> 4e81ea2 (Featire specs) ======= price: FFaker::Number.rand(1..100), >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= price: FFaker::Number.rand(1..100), >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= price: FFaker::Number.rand(1..100), >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= price: FFaker::Number.rand(1..100), >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= price: FFaker::Number.rand(1..100), >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= price: FFaker::Number.rand(1..100), >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= price: FFaker::Number.rand(1..100), >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= price: FFaker::Number.rand(1..100), >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  33. dimensions: FFaker::Book.cover,
  34. year_of_publication: FFaker::Number.rand(1900..2022),
  35. materials: 'Soft cover',
  36. quantity: FFaker::Number.rand(2..5) }
  37. end
  38. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  39. 1 before do
  40. 4 sign_in(create(:admin_user), :admin_user)
  41. 4 book
  42. 4 visit 'admin/books'
  43. end
  44. 1 it 'can create an category' do
  45. 1 click_link('New Book')
  46. 1 fill_in 'book[title]', with: params[:title]
  47. 1 fill_in 'book[description]', with: params[:description]
  48. 1 fill_in 'book[year_of_publication]', with: params[:year_of_publication]
  49. 1 fill_in 'book[price_cents]', with: params[:price_cents]
  50. 1 fill_in 'book[materials]', with: params[:materials]
  51. 1 fill_in 'book[dimensions]', with: params[:dimensions]
  52. 1 fill_in 'book[quantity]', with: params[:quantity]
  53. 1 click_button('Create Book')
  54. 1 expect(page).to have_content(params[:title])
  55. end
  56. 1 it 'can delete an book' do
  57. 1 click_link('Delete')
  58. 1 expect(page).not_to have_content(book.title)
  59. end
  60. 1 it 'can view an book' do
  61. 1 click_link('View')
  62. 1 expect(page).to have_content(book.title)
  63. end
  64. 1 it 'can edit an book' do
  65. 1 click_link('Edit')
  66. 1 fill_in 'book[title]', with: 'New title'
  67. 1 click_button('Update Book')
  68. 1 expect(page).to have_content('New title')
  69. end
  70. end

spec/feature/admin/category_spec.rb

100.0% lines covered

25 relevant lines. 25 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe 'Category' do
  2. 1 include_context 'with api request authentication helper methods'
  3. 1 include_context 'with api request global before and after hooks'
  4. 2 let(:category_name) { FFaker::Book.genre }
  5. 5 let(:category) { create(:category) }
  6. 1 before do
  7. 4 sign_in(create(:admin_user), :admin_user)
  8. 4 category
  9. 4 visit 'admin/categories'
  10. <<<<<<< HEAD ======= =======
  11. 7 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) =======
  12. 7 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs)
  13. 7 >>>>>>> 4e81ea2 (Featire specs) =======
  14. 7 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) =======
  15. 7 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  16. 7 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= =======
  17. 7 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774f (Featire specs) <<<<<<< HEAD end ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= =======
  18. 7 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  19. 7 >>>>>>> 7a02bbe (Featire specs) =======
  20. 7 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) end ======= let(:book) { FactoryBot.create(:book) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 4e81ea2 (Featire specs) ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= let(:book) { FactoryBot.create(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= let(:book) { FactoryBot.create(:book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= let(:book) { FactoryBot.create(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= let(:book) { FactoryBot.create(:book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  21. 1 <<<<<<< HEAD it 'can create an category' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) it 'can create an category' do ======= describe '#show book' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= describe '#show book' do >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= describe '#show book' do >>>>>>> 4e81ea2 (Featire specs) ======= describe '#show book' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= describe '#show book' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= describe '#show book' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= describe '#show book' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= describe '#show book' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= describe '#show book' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= describe '#show book' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= describe '#show book' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  22. 1 <<<<<<< HEAD click_link('New Category') ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) click_link('New Category') ======= it 'show books info' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= it 'show books info' do >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= it 'show books info' do >>>>>>> 4e81ea2 (Featire specs) ======= it 'show books info' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= it 'show books info' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'show books info' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= it 'show books info' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= it 'show books info' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= it 'show books info' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'show books info' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= it 'show books info' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  23. <<<<<<< HEAD
  24. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
  25. ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= =======
  26. ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  27. 1 visit "books/#{book.id}"
  28. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8480924 (Featire specs) ======= >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774f (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  29. <<<<<<< HEAD
  30. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
  31. =======
  32. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  33. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) =======
  34. >>>>>>> 4e81ea2 (Featire specs) =======
  35. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) =======
  36. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  37. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= =======
  38. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= =======
  39. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
  40. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  41. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= =======
  42. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) 1 <<<<<<< HEAD fill_in 'category[name]', with: category_name ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) fill_in 'category[name]', with: category_name ======= expect(page).to have_content(book.title) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= expect(page).to have_content(book.title) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= expect(page).to have_content(book.title) >>>>>>> 4e81ea2 (Featire specs) ======= expect(page).to have_content(book.title) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= expect(page).to have_content(book.title) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= expect(page).to have_content(book.title) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= expect(page).to have_content(book.title) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= expect(page).to have_content(book.title) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= expect(page).to have_content(book.title) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= expect(page).to have_content(book.title) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= expect(page).to have_content(book.title) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  43. <<<<<<< HEAD
  44. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
  45. =======
  46. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  47. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) =======
  48. >>>>>>> 4e81ea2 (Featire specs) =======
  49. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> fc3774f (Featire specs) <<<<<<< HEAD =======
  50. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  51. >>>>>>> 7a02bbe (Featire specs) =======
  52. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) ======= =======
  53. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= =======
  54. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  55. >>>>>>> 7a02bbe (Featire specs) =======
  56. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  57. 1 click_button('Create Category') <<<<<<< HEAD ======= ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= end >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  58. 1 <<<<<<< HEAD expect(page).to have_content(category_name) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) expect(page).to have_content(category_name) ======= it 'clicked Beck to results' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= it 'clicked Beck to results' do >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= it 'clicked Beck to results' do >>>>>>> 4e81ea2 (Featire specs) ======= it 'clicked Beck to results' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= it 'clicked Beck to results' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'clicked Beck to results' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= it 'clicked Beck to results' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= it 'clicked Beck to results' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= it 'clicked Beck to results' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'clicked Beck to results' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= it 'clicked Beck to results' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  59. <<<<<<< HEAD
  60. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
  61. =======
  62. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) =======
  63. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs)
  64. 1 >>>>>>> 4e81ea2 (Featire specs) =======
  65. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) =======
  66. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  67. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= =======
  68. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774f (Featire specs) <<<<<<< HEAD end ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= =======
  69. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  70. 1 >>>>>>> 7a02bbe (Featire specs) =======
  71. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) end ======= visit "books/#{book.id}" >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 4e81ea2 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit "books/#{book.id}" >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit "books/#{book.id}" >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= visit "books/#{book.id}" >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  72. 1 <<<<<<< HEAD it 'can delete an category' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) it 'can delete an category' do ======= find('a', class: 'general-back-link').click >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= find('a', class: 'general-back-link').click >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= find('a', class: 'general-back-link').click >>>>>>> 4e81ea2 (Featire specs) ======= find('a', class: 'general-back-link').click >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= find('a', class: 'general-back-link').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= find('a', class: 'general-back-link').click >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= find('a', class: 'general-back-link').click >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= find('a', class: 'general-back-link').click >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= find('a', class: 'general-back-link').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= find('a', class: 'general-back-link').click >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= find('a', class: 'general-back-link').click >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  73. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  74. 1 click_link('Delete')
  75. <<<<<<< HEAD ======= =======
  76. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  77. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) =======
  78. >>>>>>> 4e81ea2 (Featire specs) =======
  79. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) =======
  80. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  81. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= =======
  82. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= =======
  83. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
  84. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  85. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= =======
  86. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  87. <<<<<<< HEAD
  88. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
  89. =======
  90. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  91. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) =======
  92. >>>>>>> 4e81ea2 (Featire specs) =======
  93. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) =======
  94. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  95. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= =======
  96. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= =======
  97. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
  98. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  99. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= =======
  100. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) 1 <<<<<<< HEAD expect(page).not_to have_content(category.name) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) expect(page).not_to have_content(category.name) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= expect(page).not_to have_content(category.name) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) expect(page).to have_content('Catalog')
  101. end <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8480924 (Featire specs) ======= >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774f (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  102. <<<<<<< HEAD end ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) end ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  103. <<<<<<< HEAD
  104. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
  105. =======
  106. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) =======
  107. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs)
  108. 1 >>>>>>> 4e81ea2 (Featire specs) =======
  109. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) =======
  110. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  111. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= =======
  112. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774f (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= =======
  113. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  114. 1 >>>>>>> 7a02bbe (Featire specs) =======
  115. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= context 'when test read more' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= context 'when test read more' do >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= context 'when test read more' do >>>>>>> 4e81ea2 (Featire specs) ======= context 'when test read more' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= context 'when test read more' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= context 'when test read more' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= context 'when test read more' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= context 'when test read more' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= context 'when test read more' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= context 'when test read more' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= context 'when test read more' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  116. 1 <<<<<<< HEAD it 'can view an category' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) it 'can view an category' do ======= it 'show read more' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= it 'show read more' do >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= it 'show read more' do >>>>>>> 4e81ea2 (Featire specs) ======= it 'show read more' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= it 'show read more' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'show read more' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= it 'show read more' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= it 'show read more' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= it 'show read more' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'show read more' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= it 'show read more' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  117. 1 <<<<<<< HEAD click_link('View') ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) click_link('View') ======= visit "books/#{book.id}" >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 4e81ea2 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit "books/#{book.id}" >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit "books/#{book.id}" >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= visit "books/#{book.id}" >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  118. 1 <<<<<<< HEAD expect(page).to have_content(category.name) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) expect(page).to have_content(category.name) ======= expect(page).to have_content('Read More') >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= expect(page).to have_content('Read More') >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= expect(page).to have_content('Read More') >>>>>>> 4e81ea2 (Featire specs) ======= expect(page).to have_content('Read More') >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= expect(page).to have_content('Read More') >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= expect(page).to have_content('Read More') >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= expect(page).to have_content('Read More') >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= expect(page).to have_content('Read More') >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= expect(page).to have_content('Read More') >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= expect(page).to have_content('Read More') >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= expect(page).to have_content('Read More') >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  119. <<<<<<< HEAD end ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) end ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= end >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  120. 1 <<<<<<< HEAD it 'can edit an category' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) it 'can edit an category' do ======= it 'clicked read more', js: true do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= it 'clicked read more', js: true do >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= it 'clicked read more', js: true do >>>>>>> 4e81ea2 (Featire specs) ======= it 'clicked read more', js: true do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= it 'clicked read more', js: true do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'clicked read more', js: true do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= it 'clicked read more', js: true do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= it 'clicked read more', js: true do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= it 'clicked read more', js: true do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'clicked read more', js: true do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= it 'clicked read more', js: true do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  121. 1 <<<<<<< HEAD click_link('Edit') ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) click_link('Edit') ======= visit "books/#{book.id}" >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 4e81ea2 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit "books/#{book.id}" >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit "books/#{book.id}" >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= visit "books/#{book.id}" >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  122. 1 <<<<<<< HEAD fill_in 'category[name]', with: 'New Genre' ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) fill_in 'category[name]', with: 'New Genre' ======= click_link 'Read More' >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= click_link 'Read More' >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= click_link 'Read More' >>>>>>> 4e81ea2 (Featire specs) ======= click_link 'Read More' >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= click_link 'Read More' >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= click_link 'Read More' >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= click_link 'Read More' >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= click_link 'Read More' >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= click_link 'Read More' >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= click_link 'Read More' >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= click_link 'Read More' >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  123. 1 <<<<<<< HEAD click_button('Update Category') ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) click_button('Update Category') ======= expect(page).not_to have_content('Read More') >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= expect(page).not_to have_content('Read More') >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= expect(page).not_to have_content('Read More') >>>>>>> 4e81ea2 (Featire specs) ======= expect(page).not_to have_content('Read More') >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= expect(page).not_to have_content('Read More') >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= expect(page).not_to have_content('Read More') >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= expect(page).not_to have_content('Read More') >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= expect(page).not_to have_content('Read More') >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= expect(page).not_to have_content('Read More') >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= expect(page).not_to have_content('Read More') >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= expect(page).not_to have_content('Read More') >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  124. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= end >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  125. <<<<<<< HEAD
  126. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
  127. 1 =======
  128. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) =======
  129. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs)
  130. >>>>>>> 4e81ea2 (Featire specs) =======
  131. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) =======
  132. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  133. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= =======
  134. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774f (Featire specs) <<<<<<< HEAD expect(page).to have_content('New Genre') ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= =======
  135. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  136. >>>>>>> 7a02bbe (Featire specs) =======
  137. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) expect(page).to have_content('New Genre') ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= end >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  138. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) end
  139. end

spec/feature/billing_spec.rb

73.08% lines covered

26 relevant lines. 19 lines covered and 7 lines missed.
    
  1. 1 RSpec.describe 'Billing', type: :feature do
  2. 1 include_context 'with api request authentication helper methods'
  3. 1 include_context 'with api request global before and after hooks'
  4. <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  5. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  6. 2 let(:user) { create(:user) }
  7. 1 let(:attributes_for) { attributes_for(:billing) }
  8. 1 describe '#fill_in', js: true do
  9. 1 it 'fill in billing' do
  10. 1 sign_in(user)
  11. 1 visit edit_user_path(user.id)
  12. 1 within('div#billing.col-md-5.mb-40') do
  13. 1 find_all('div', class: 'form-group')[0] do
  14. fill_in :first_name, with: attributes_for[:first_name]
  15. end
  16. 1 find_all('div', class: 'form-group')[1] do
  17. fill_in :last_name, with: attributes_for[:last_name]
  18. end
  19. 1 find_all('div', class: 'form-group')[2] do
  20. fill_in :address, with: attributes_for[:address]
  21. end
  22. 1 find_all('div', class: 'form-group')[3] do
  23. fill_in :city, with: attributes_for[:city]
  24. end
  25. 1 find_all('div', class: 'form-group')[4] do
  26. fill_in :zip, with: attributes_for[:zip]
  27. end
  28. 1 find_all('div', class: 'form-group')[5] do
  29. fill_in :country, with: attributes_for[:country]
  30. end
  31. 1 find_all('div', class: 'form-group')[6] do
  32. fill_in :phone, with: attributes_for[:phone]
  33. end
  34. 1 click_on I18n.t('settings.save')
  35. end
  36. 1 expect(page).to have_content(I18n.t('settings.message.update'))
  37. end
  38. end
  39. end

spec/feature/book_spec.rb

100.0% lines covered

104 relevant lines. 104 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe 'Book', type: :feature do
  2. 5 let(:category_one) { create(:category) }
  3. 3 let(:category_two) { create(:category) }
  4. 1 let(:params) do
  5. 4 { title: FFaker::Book.title,
  6. description: FFaker::Book.description,
  7. price_cents: FFaker::Number.rand(1..100),
  8. dimensions: FFaker::Book.cover,
  9. year_of_publication: FFaker::Number.rand(1900..2022),
  10. materials: 'Soft cover',
  11. quantity: FFaker::Number.rand(2..5) }
  12. end
  13. 7 let(:book) { create(:book).decorate }
  14. 1 describe '#show book' do
  15. 1 it 'show books info' do
  16. 1 visit "books/#{book.id}"
  17. 1 expect(page).to have_content(book.title)
  18. end
  19. 1 it 'clicked Beck to results' do
  20. 1 visit "books/#{book.id}"
  21. 1 find('a', class: 'general-back-link').click
  22. 1 expect(page).to have_content(I18n.t('catalog_page.title'))
  23. end
  24. 1 context 'when test read more' do
  25. 1 it 'show read more' do
  26. 1 visit "books/#{book.id}"
  27. 1 expect(page).to have_content(I18n.t('book_page.read_more'))
  28. end
  29. 1 it 'clicked read more', js: true do
  30. 1 visit "books/#{book.id}"
  31. 1 click_link 'Read More'
  32. 1 expect(page).not_to have_content(I18n.t('book_page.read_more'))
  33. end
  34. end
  35. <<<<<<< HEAD ======= =======
  36. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  37. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) =======
  38. >>>>>>> 4e81ea2 (Featire specs) =======
  39. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) =======
  40. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  41. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= =======
  42. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= =======
  43. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
  44. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  45. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= =======
  46. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) 1 context 'when quantity changes', js: true do
  47. <<<<<<< HEAD
  48. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
  49. =======
  50. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  51. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) =======
  52. >>>>>>> 4e81ea2 (Featire specs) =======
  53. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) =======
  54. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  55. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= =======
  56. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= =======
  57. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
  58. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  59. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= =======
  60. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) 1 before do
  61. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  62. 2 visit "books/#{book.id}"
  63. <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  64. 2 <<<<<<< HEAD find('a', class: 'inc').click ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) find('a', class: 'inc').click ======= visit "books/#{book.id}" >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 4e81ea2 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit "books/#{book.id}" >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit "books/#{book.id}" >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= visit "books/#{book.id}" >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  65. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) end
  66. <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  67. <<<<<<< HEAD
  68. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
  69. 1 =======
  70. 2 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) =======
  71. 2 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs)
  72. 2 >>>>>>> 4e81ea2 (Featire specs) =======
  73. 2 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> fc3774f (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  74. 2 ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD find('a', class: 'inc').click
  75. end
  76. 1 <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  77. 2 find('a', class: 'inc').click
  78. end
  79. 1 <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) it 'increase quantity' do >>>>>>> fc3774f (Featire specs) ======= <<<<<<< HEAD it 'increase quantity' do >>>>>>> d8dd3b4 (Featire specs) ======= <<<<<<< HEAD it 'increase quantity' do >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) it 'increase quantity' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'increase quantity' do ======= it 'increase quantity', js: true do >>>>>>> 752f0c0 (Featire specs) ======= it 'increase quantity', js: true do >>>>>>> 4e81ea2 (Featire specs) ======= it 'increase quantity', js: true do >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= ======= it 'increase quantity' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= it 'increase quantity' do >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) it 'increase quantity' do ======= find('a', class: 'inc').click >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) >>>>>>> a636fda (Featire specs) ======= ======= find('a', class: 'inc').click >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= ======= find('a', class: 'inc').click >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= find('a', class: 'inc').click >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= ======= it 'increase quantity' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= it 'increase quantity', js: true do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= ======= it 'increase quantity' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= ======= it 'increase quantity' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= it 'increase quantity', js: true do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= ======= it 'increase quantity' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  80. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs)
  81. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs)
  82. ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  83. ======= >>>>>>> ed32b84 (Featire specs)
  84. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  85. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) =======
  86. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= =======
  87. >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) ======= =======
  88. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) 1 <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) expect(page).to have_content("€#{Money.new(book.price_cents * 2)}")
  89. <<<<<<< HEAD ======= =======
  90. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  91. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) =======
  92. >>>>>>> 4e81ea2 (Featire specs) =======
  93. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= =======
  94. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774f (Featire specs) end
  95. <<<<<<< HEAD
  96. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs)
  97. =======
  98. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  99. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) =======
  100. >>>>>>> 4e81ea2 (Featire specs) =======
  101. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= =======
  102. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774f (Featire specs)
  103. <<<<<<< HEAD
  104. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs)
  105. =======
  106. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  107. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) =======
  108. >>>>>>> 4e81ea2 (Featire specs) =======
  109. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= =======
  110. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774f (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) it 'decrease quantity' do >>>>>>> 8480924 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) it 'decrease quantity' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'decrease quantity' do ======= it 'decrease quantity', js: true do >>>>>>> 752f0c0 (Featire specs) ======= it 'decrease quantity', js: true do >>>>>>> 4e81ea2 (Featire specs) ======= it 'decrease quantity', js: true do >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= ======= it 'decrease quantity' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= it 'decrease quantity' do >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) it 'decrease quantity' do ======= it 'increase quantity', js: true do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) >>>>>>> a636fda (Featire specs) ======= ======= it 'increase quantity', js: true do >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= ======= it 'increase quantity', js: true do >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= it 'increase quantity', js: true do >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774f (Featire specs)
  111. <<<<<<< HEAD
  112. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs)
  113. =======
  114. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  115. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) =======
  116. >>>>>>> 4e81ea2 (Featire specs) =======
  117. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= =======
  118. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774f (Featire specs) 1 <<<<<<< HEAD find('a', class: 'dec').click ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) find('a', class: 'dec').click ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= find('a', class: 'dec').click ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) expect(page).to have_content("€#{book.price * 2}")
  119. end
  120. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8480924 (Featire specs) ======= >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774f (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  121. 1 <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) it 'decrease quantity', js: true do <<<<<<< HEAD ======= ======= it 'decrease quantity' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) it 'decrease quantity', js: true do <<<<<<< HEAD >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= it 'decrease quantity' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= ======= it 'decrease quantity', js: true do >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= it 'decrease quantity' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'decrease quantity', js: true do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= it 'decrease quantity' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  122. 1 find('a', class: 'dec').click
  123. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8480924 (Featire specs) ======= >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774f (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) expect(page).to have_content("€#{book.price}")
  124. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  125. end
  126. end
  127. <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  128. <<<<<<< HEAD end ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) end ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= end >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  129. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) end
  130. end
  131. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8480924 (Featire specs) ======= >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774f (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  132. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  133. 1 describe '#catalog' do
  134. 1 describe 'filter by category' do
  135. <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  136. 1 <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) describe '#catalog' do
  137. 1 describe 'filter by category' do
  138. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8480924 (Featire specs) ======= >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774f (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) before do
  139. <<<<<<< HEAD
  140. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
  141. =======
  142. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  143. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) =======
  144. >>>>>>> 4e81ea2 (Featire specs) =======
  145. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) =======
  146. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  147. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= =======
  148. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= =======
  149. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
  150. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  151. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= =======
  152. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) 2 category_one.books.create(params)
  153. <<<<<<< HEAD
  154. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
  155. =======
  156. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  157. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) =======
  158. >>>>>>> 4e81ea2 (Featire specs) =======
  159. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) =======
  160. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  161. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= =======
  162. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= =======
  163. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
  164. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  165. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= =======
  166. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) 2 visit books_path
  167. <<<<<<< HEAD
  168. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
  169. =======
  170. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  171. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) =======
  172. >>>>>>> 4e81ea2 (Featire specs) =======
  173. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) =======
  174. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  175. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= =======
  176. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= =======
  177. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
  178. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  179. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= =======
  180. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) end
  181. <<<<<<< HEAD
  182. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
  183. =======
  184. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  185. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) =======
  186. >>>>>>> 4e81ea2 (Featire specs) =======
  187. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) =======
  188. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  189. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= =======
  190. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= =======
  191. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
  192. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  193. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= =======
  194. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  195. <<<<<<< HEAD
  196. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
  197. =======
  198. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  199. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) =======
  200. >>>>>>> 4e81ea2 (Featire specs) =======
  201. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) =======
  202. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  203. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= =======
  204. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= =======
  205. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
  206. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  207. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= =======
  208. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) 1 after do
  209. <<<<<<< HEAD
  210. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
  211. =======
  212. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  213. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) =======
  214. >>>>>>> 4e81ea2 (Featire specs) =======
  215. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) =======
  216. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  217. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= =======
  218. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= =======
  219. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
  220. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  221. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= =======
  222. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) 2 category_one.destroy
  223. <<<<<<< HEAD
  224. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
  225. =======
  226. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  227. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) =======
  228. >>>>>>> 4e81ea2 (Featire specs) =======
  229. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) =======
  230. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  231. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= =======
  232. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= =======
  233. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
  234. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  235. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= =======
  236. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) end
  237. <<<<<<< HEAD
  238. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
  239. =======
  240. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  241. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) =======
  242. >>>>>>> 4e81ea2 (Featire specs) =======
  243. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) =======
  244. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  245. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= =======
  246. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= =======
  247. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
  248. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  249. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= =======
  250. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  251. <<<<<<< HEAD
  252. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
  253. =======
  254. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  255. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) =======
  256. >>>>>>> 4e81ea2 (Featire specs) =======
  257. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) =======
  258. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  259. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= =======
  260. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= =======
  261. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
  262. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  263. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= =======
  264. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) 1 it 'show book count for category' do
  265. <<<<<<< HEAD
  266. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
  267. =======
  268. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  269. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) =======
  270. >>>>>>> 4e81ea2 (Featire specs) =======
  271. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) =======
  272. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  273. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= =======
  274. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= =======
  275. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
  276. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  277. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= =======
  278. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) 1 expect(page).to have_content(category_one.books.size)
  279. <<<<<<< HEAD
  280. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
  281. =======
  282. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  283. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) =======
  284. >>>>>>> 4e81ea2 (Featire specs) =======
  285. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) =======
  286. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  287. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= =======
  288. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= =======
  289. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
  290. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  291. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= =======
  292. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) end
  293. <<<<<<< HEAD
  294. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
  295. =======
  296. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  297. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) =======
  298. >>>>>>> 4e81ea2 (Featire specs) =======
  299. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) =======
  300. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  301. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= =======
  302. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= =======
  303. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
  304. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  305. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= =======
  306. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  307. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  308. 1 it 'filter book by category' do
  309. 1 within 'ul', class: 'list-inline pt-10 mb-25 mr-240', id: 'filter' do
  310. <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  311. 1 <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) it 'filter book by category' do
  312. 1 within 'ul', class: 'list-inline pt-10 mb-25 mr-240', id: 'filter' do
  313. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8480924 (Featire specs) ======= >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774f (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) click_on category_one.name
  314. <<<<<<< HEAD
  315. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
  316. =======
  317. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  318. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) =======
  319. >>>>>>> 4e81ea2 (Featire specs) =======
  320. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) =======
  321. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  322. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= =======
  323. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= =======
  324. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
  325. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  326. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= =======
  327. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) end
  328. <<<<<<< HEAD
  329. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
  330. =======
  331. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  332. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) =======
  333. >>>>>>> 4e81ea2 (Featire specs) =======
  334. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) =======
  335. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  336. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= =======
  337. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= =======
  338. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
  339. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  340. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= =======
  341. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  342. <<<<<<< HEAD
  343. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
  344. =======
  345. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  346. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) =======
  347. >>>>>>> 4e81ea2 (Featire specs) =======
  348. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) =======
  349. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  350. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= =======
  351. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= =======
  352. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
  353. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  354. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= =======
  355. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) 1 expect(page).to have_content(category_one.books.first.title)
  356. <<<<<<< HEAD
  357. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
  358. =======
  359. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  360. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) =======
  361. >>>>>>> 4e81ea2 (Featire specs) =======
  362. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) =======
  363. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  364. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= =======
  365. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= =======
  366. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
  367. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  368. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= =======
  369. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) end
  370. <<<<<<< HEAD
  371. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
  372. =======
  373. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  374. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) =======
  375. >>>>>>> 4e81ea2 (Featire specs) =======
  376. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) =======
  377. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  378. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= =======
  379. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= =======
  380. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
  381. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  382. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= =======
  383. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) end
  384. <<<<<<< HEAD
  385. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
  386. =======
  387. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  388. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) =======
  389. >>>>>>> 4e81ea2 (Featire specs) =======
  390. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) =======
  391. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  392. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= =======
  393. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= =======
  394. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
  395. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  396. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= =======
  397. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  398. <<<<<<< HEAD
  399. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
  400. =======
  401. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  402. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) =======
  403. >>>>>>> 4e81ea2 (Featire specs) =======
  404. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) =======
  405. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  406. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= =======
  407. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= =======
  408. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
  409. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  410. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= =======
  411. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) 1 describe 'filter by all books' do
  412. <<<<<<< HEAD
  413. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
  414. =======
  415. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  416. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) =======
  417. >>>>>>> 4e81ea2 (Featire specs) =======
  418. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) =======
  419. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  420. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= =======
  421. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= =======
  422. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
  423. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  424. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= =======
  425. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) 1 before do
  426. <<<<<<< HEAD
  427. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
  428. =======
  429. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  430. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) =======
  431. >>>>>>> 4e81ea2 (Featire specs) =======
  432. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) =======
  433. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  434. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= =======
  435. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= =======
  436. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
  437. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  438. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= =======
  439. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) 2 category_one.books.create(params)
  440. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  441. 2 category_two.books.create(params)
  442. <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  443. 2 <<<<<<< HEAD visit books_path ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) visit books_path ======= category_two.books.create(params) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= category_two.books.create(params) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= category_two.books.create(params) >>>>>>> 4e81ea2 (Featire specs) ======= category_two.books.create(params) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= category_two.books.create(params) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= category_two.books.create(params) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= category_two.books.create(params) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= category_two.books.create(params) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= category_two.books.create(params) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= category_two.books.create(params) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= category_two.books.create(params) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  444. 2 <<<<<<< HEAD click_on I18n.t('catalog_page.all') ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) click_on I18n.t('catalog_page.all') ======= visit books_path >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= visit books_path >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= visit books_path >>>>>>> 4e81ea2 (Featire specs) ======= visit books_path >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit books_path >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= visit books_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= visit books_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit books_path >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= visit books_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  445. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  446. 2 click_on 'All'
  447. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8480924 (Featire specs) ======= >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774f (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) end
  448. <<<<<<< HEAD
  449. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
  450. =======
  451. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  452. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) =======
  453. >>>>>>> 4e81ea2 (Featire specs) =======
  454. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) =======
  455. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  456. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= =======
  457. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= =======
  458. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
  459. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  460. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= =======
  461. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  462. <<<<<<< HEAD
  463. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
  464. =======
  465. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  466. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) =======
  467. >>>>>>> 4e81ea2 (Featire specs) =======
  468. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) =======
  469. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  470. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= =======
  471. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= =======
  472. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
  473. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  474. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= =======
  475. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) 1 after do
  476. <<<<<<< HEAD
  477. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
  478. =======
  479. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  480. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) =======
  481. >>>>>>> 4e81ea2 (Featire specs) =======
  482. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) =======
  483. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  484. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= =======
  485. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= =======
  486. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
  487. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  488. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= =======
  489. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) 2 category_one.destroy
  490. <<<<<<< HEAD
  491. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
  492. =======
  493. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  494. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) =======
  495. >>>>>>> 4e81ea2 (Featire specs) =======
  496. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) =======
  497. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  498. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= =======
  499. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= =======
  500. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
  501. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  502. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= =======
  503. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) 2 category_two.destroy
  504. <<<<<<< HEAD
  505. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
  506. =======
  507. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  508. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) =======
  509. >>>>>>> 4e81ea2 (Featire specs) =======
  510. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) =======
  511. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  512. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= =======
  513. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= =======
  514. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
  515. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  516. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= =======
  517. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) end
  518. <<<<<<< HEAD
  519. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
  520. =======
  521. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  522. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) =======
  523. >>>>>>> 4e81ea2 (Featire specs) =======
  524. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) =======
  525. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  526. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= =======
  527. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= =======
  528. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
  529. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  530. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= =======
  531. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  532. <<<<<<< HEAD
  533. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
  534. =======
  535. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  536. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) =======
  537. >>>>>>> 4e81ea2 (Featire specs) =======
  538. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) =======
  539. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  540. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= =======
  541. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= =======
  542. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
  543. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  544. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= =======
  545. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) 1 it 'shown books for first category' do
  546. <<<<<<< HEAD
  547. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
  548. =======
  549. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  550. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) =======
  551. >>>>>>> 4e81ea2 (Featire specs) =======
  552. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) =======
  553. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  554. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= =======
  555. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= =======
  556. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
  557. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  558. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= =======
  559. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) 1 expect(page).to have_content(category_one.books.first.title)
  560. <<<<<<< HEAD
  561. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
  562. =======
  563. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  564. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) =======
  565. >>>>>>> 4e81ea2 (Featire specs) =======
  566. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) =======
  567. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  568. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= =======
  569. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= =======
  570. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
  571. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  572. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= =======
  573. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) end
  574. <<<<<<< HEAD
  575. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
  576. =======
  577. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  578. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) =======
  579. >>>>>>> 4e81ea2 (Featire specs) =======
  580. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) =======
  581. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  582. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= =======
  583. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= =======
  584. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
  585. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  586. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= =======
  587. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  588. <<<<<<< HEAD
  589. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
  590. =======
  591. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  592. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) =======
  593. >>>>>>> 4e81ea2 (Featire specs) =======
  594. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) =======
  595. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  596. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= =======
  597. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= =======
  598. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
  599. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  600. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= =======
  601. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) 1 it 'shown books for second category' do
  602. <<<<<<< HEAD
  603. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
  604. =======
  605. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  606. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) =======
  607. >>>>>>> 4e81ea2 (Featire specs) =======
  608. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) =======
  609. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  610. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= =======
  611. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= =======
  612. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
  613. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  614. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= =======
  615. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) 1 expect(page).to have_content(category_two.books.first.title)
  616. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  617. end
  618. end
  619. <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  620. <<<<<<< HEAD end ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) end ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= end >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  621. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) end
  622. end
  623. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8480924 (Featire specs) ======= >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774f (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  624. <<<<<<< HEAD
  625. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
  626. =======
  627. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  628. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) =======
  629. >>>>>>> 4e81ea2 (Featire specs) =======
  630. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) =======
  631. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  632. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= =======
  633. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= =======
  634. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
  635. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  636. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= =======
  637. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) 1 describe 'load_more' do
  638. <<<<<<< HEAD
  639. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
  640. =======
  641. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  642. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) =======
  643. >>>>>>> 4e81ea2 (Featire specs) =======
  644. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) =======
  645. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  646. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= =======
  647. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= =======
  648. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
  649. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  650. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= =======
  651. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) 1 before do
  652. <<<<<<< HEAD
  653. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
  654. =======
  655. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  656. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) =======
  657. >>>>>>> 4e81ea2 (Featire specs) =======
  658. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) =======
  659. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  660. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= =======
  661. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= =======
  662. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
  663. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  664. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= =======
  665. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) 3 <<<<<<< HEAD <<<<<<< HEAD 24.times do ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 24.times do ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) (BooksController::PAGINATION_PER_PAGE * 2).times do ======= 24.times do <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= 24.times do >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) ======= 24.times do >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= 24.times do >>>>>>> 34509ee (Featire specs) >>>>>>> 3723aad (Featire specs) ======= ======= (BooksController::PAGINATION_PER_PAGE * 2).times do ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) (BooksController::PAGINATION_PER_PAGE * 2).times do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD (BooksController::PAGINATION_PER_PAGE * 2).times do ======= 24.times do >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= 24.times do >>>>>>> 9c0d812 (Featire specs) ======= 24.times do >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) ======= 24.times do >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD (BooksController::PAGINATION_PER_PAGE * 2).times do ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 752f0c0 (Featire specs) ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 4e81ea2 (Featire specs) ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774f (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= (BooksController::PAGINATION_PER_PAGE * 2).times do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= 24.times do >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= 24.times do >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) 24.times do ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= ======= ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= ======= ======= (BooksController::PAGINATION_PER_PAGE * 2).times do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= ======= ======= (BooksController::PAGINATION_PER_PAGE * 2).times do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= ======= (BooksController::PAGINATION_PER_PAGE * 2).times do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= ======= (BooksController::PAGINATION_PER_PAGE * 2).times do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  666. <<<<<<< HEAD
  667. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
  668. =======
  669. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  670. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) =======
  671. >>>>>>> 4e81ea2 (Featire specs) =======
  672. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) =======
  673. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  674. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= =======
  675. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= =======
  676. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
  677. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  678. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= =======
  679. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) 72 <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) books << create(:book)
  680. end
  681. end <<<<<<< HEAD ======= ======= books << FactoryBot.create(:book) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= books << FactoryBot.create(:book) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= books << FactoryBot.create(:book) >>>>>>> 4e81ea2 (Featire specs) ======= books << FactoryBot.create(:book) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= books << FactoryBot.create(:book) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= books << FactoryBot.create(:book) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= books << FactoryBot.create(:book) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= books << FactoryBot.create(:book) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= books << FactoryBot.create(:book) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= books << FactoryBot.create(:book) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= books << FactoryBot.create(:book) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  682. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= end >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  683. <<<<<<< HEAD
  684. 4 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
  685. 4 =======
  686. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) =======
  687. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs)
  688. >>>>>>> 4e81ea2 (Featire specs) =======
  689. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) =======
  690. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  691. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= =======
  692. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774f (Featire specs) <<<<<<< HEAD let(:books) { [] } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= =======
  693. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  694. >>>>>>> 7a02bbe (Featire specs) =======
  695. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) let(:books) { [] } ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= end >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  696. <<<<<<< HEAD
  697. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
  698. 1 =======
  699. 4 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) =======
  700. 4 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs)
  701. 4 >>>>>>> 4e81ea2 (Featire specs) =======
  702. 4 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) =======
  703. 4 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  704. 4 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= =======
  705. 4 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774f (Featire specs) <<<<<<< HEAD it 'show books without view more button' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= =======
  706. 4 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  707. 4 >>>>>>> 7a02bbe (Featire specs) =======
  708. 4 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) it 'show books without view more button' do ======= let(:books) { [] } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= let(:books) { [] } >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= let(:books) { [] } >>>>>>> 4e81ea2 (Featire specs) ======= let(:books) { [] } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= let(:books) { [] } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:books) { [] } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= let(:books) { [] } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= let(:books) { [] } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= let(:books) { [] } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:books) { [] } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= let(:books) { [] } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  709. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  710. 1 visit books_path
  711. <<<<<<< HEAD ======= =======
  712. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  713. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) =======
  714. >>>>>>> 4e81ea2 (Featire specs) =======
  715. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) =======
  716. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  717. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= =======
  718. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= =======
  719. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
  720. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  721. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= =======
  722. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  723. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  724. 1 it 'show books without view more button' do
  725. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8480924 (Featire specs) ======= >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774f (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  726. 1 <<<<<<< HEAD find('a', id: 'view_more', class: 'view_more').click ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) find('a', id: 'view_more', class: 'view_more').click ======= visit books_path >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= visit books_path >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= visit books_path >>>>>>> 4e81ea2 (Featire specs) ======= visit books_path >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit books_path >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= visit books_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= visit books_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit books_path >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= visit books_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  727. 1 <<<<<<< HEAD expect(page).not_to have_css('a', class: 'view_more hidden', id: 'view_more') ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) expect(page).not_to have_css('a', class: 'view_more hidden', id: 'view_more') ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 4e81ea2 (Featire specs) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  728. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  729. 1 expect(page).not_to have_css('a', class: 'view_more hidden', id: 'view_more')
  730. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8480924 (Featire specs) ======= >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774f (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) end
  731. <<<<<<< HEAD
  732. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
  733. =======
  734. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  735. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) =======
  736. >>>>>>> 4e81ea2 (Featire specs) =======
  737. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) =======
  738. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  739. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= =======
  740. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= =======
  741. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
  742. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  743. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= =======
  744. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  745. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  746. 1 context 'when view more' do
  747. 1 it 'show books with view more button' do
  748. <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  749. 1 <<<<<<< HEAD visit books_path ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) visit books_path ======= context 'when view more' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= context 'when view more' do >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= context 'when view more' do >>>>>>> 4e81ea2 (Featire specs) ======= context 'when view more' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= context 'when view more' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= context 'when view more' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= context 'when view more' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= context 'when view more' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= context 'when view more' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= context 'when view more' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= context 'when view more' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  750. <<<<<<< HEAD
  751. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
  752. =======
  753. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) =======
  754. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs)
  755. 1 >>>>>>> 4e81ea2 (Featire specs) =======
  756. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) =======
  757. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  758. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= =======
  759. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774f (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= =======
  760. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  761. 1 >>>>>>> 7a02bbe (Featire specs) =======
  762. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= it 'show books with view more button' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= it 'show books with view more button' do >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= it 'show books with view more button' do >>>>>>> 4e81ea2 (Featire specs) ======= it 'show books with view more button' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= it 'show books with view more button' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'show books with view more button' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= it 'show books with view more button' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= it 'show books with view more button' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= it 'show books with view more button' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'show books with view more button' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= it 'show books with view more button' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  763. 1 <<<<<<< HEAD expect(page).to have_css('a', class: 'view_more') ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) expect(page).to have_css('a', class: 'view_more') ======= visit books_path >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= visit books_path >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= visit books_path >>>>>>> 4e81ea2 (Featire specs) ======= visit books_path >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit books_path >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= visit books_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= visit books_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit books_path >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= visit books_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  764. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  765. 1 expect(page).to have_css('a', class: 'view_more')
  766. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8480924 (Featire specs) ======= >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774f (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) end
  767. <<<<<<< HEAD
  768. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
  769. =======
  770. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  771. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) =======
  772. >>>>>>> 4e81ea2 (Featire specs) =======
  773. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) =======
  774. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  775. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= =======
  776. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= =======
  777. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
  778. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  779. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= =======
  780. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  781. <<<<<<< HEAD
  782. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
  783. =======
  784. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  785. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) =======
  786. >>>>>>> 4e81ea2 (Featire specs) =======
  787. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) =======
  788. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  789. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= =======
  790. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= =======
  791. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
  792. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  793. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= =======
  794. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) 1 it 'show loaded books', js: true do
  795. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  796. 1 visit books_path
  797. <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  798. 1 <<<<<<< HEAD find('a', class: 'view_more').click ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) find('a', class: 'view_more').click ======= visit books_path >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= visit books_path >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= visit books_path >>>>>>> 4e81ea2 (Featire specs) ======= visit books_path >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit books_path >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= visit books_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= visit books_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit books_path >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= visit books_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  799. 1 <<<<<<< HEAD expect(page).to have_content(books.last.title) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) expect(page).to have_content(books.last.title) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 4e81ea2 (Featire specs) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  800. <<<<<<< HEAD end ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) end ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  801. <<<<<<< HEAD
  802. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
  803. =======
  804. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) =======
  805. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs)
  806. 1 >>>>>>> 4e81ea2 (Featire specs) =======
  807. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) =======
  808. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  809. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= =======
  810. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774f (Featire specs) <<<<<<< HEAD end ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= =======
  811. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  812. 1 >>>>>>> 7a02bbe (Featire specs) =======
  813. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) end ======= expect(page).to have_content(books.last.title) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= expect(page).to have_content(books.last.title) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= expect(page).to have_content(books.last.title) >>>>>>> 4e81ea2 (Featire specs) ======= expect(page).to have_content(books.last.title) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= expect(page).to have_content(books.last.title) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= expect(page).to have_content(books.last.title) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= expect(page).to have_content(books.last.title) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= expect(page).to have_content(books.last.title) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= expect(page).to have_content(books.last.title) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= expect(page).to have_content(books.last.title) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= expect(page).to have_content(books.last.title) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  814. <<<<<<< HEAD end ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) end ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= end >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  815. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) end
  816. end
  817. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8480924 (Featire specs) ======= >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774f (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  818. <<<<<<< HEAD
  819. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
  820. =======
  821. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  822. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) =======
  823. >>>>>>> 4e81ea2 (Featire specs) =======
  824. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) =======
  825. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  826. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= =======
  827. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= =======
  828. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
  829. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  830. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= =======
  831. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) 1 describe 'sort' do
  832. <<<<<<< HEAD
  833. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
  834. =======
  835. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  836. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) =======
  837. >>>>>>> 4e81ea2 (Featire specs) =======
  838. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) =======
  839. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  840. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= =======
  841. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= =======
  842. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
  843. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  844. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= =======
  845. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) 1 shared_examples 'sort test' do
  846. <<<<<<< HEAD
  847. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
  848. =======
  849. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  850. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) =======
  851. >>>>>>> 4e81ea2 (Featire specs) =======
  852. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) =======
  853. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  854. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= =======
  855. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= =======
  856. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
  857. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  858. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= =======
  859. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) 5 it 'sort books' do
  860. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  861. 5 create(:book, title: 'Zimbabwe', price_cents: 75,
  862. created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
  863. <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  864. 5 <<<<<<< HEAD create(:book, title: 'Anna', price_cents: 23, ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) create(:book, title: 'Anna', price_cents: 23, ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 4e81ea2 (Featire specs) ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  865. <<<<<<< HEAD <<<<<<< HEAD created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> 34509ee (Featire specs) >>>>>>> 3723aad (Featire specs) ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> 9c0d812 (Featire specs) ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 752f0c0 (Featire specs) ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 4e81ea2 (Featire specs) ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774f (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  866. <<<<<<< HEAD
  867. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
  868. ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= =======
  869. ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  870. 5 FactoryBot.create(:book, title: 'Anna', price: 23, created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
  871. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8480924 (Featire specs) ======= >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774f (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  872. <<<<<<< HEAD
  873. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
  874. =======
  875. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  876. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) =======
  877. >>>>>>> 4e81ea2 (Featire specs) =======
  878. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) =======
  879. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  880. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= =======
  881. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= =======
  882. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
  883. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  884. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= =======
  885. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) 5 visit books_path
  886. <<<<<<< HEAD
  887. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
  888. =======
  889. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  890. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) =======
  891. >>>>>>> 4e81ea2 (Featire specs) =======
  892. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) =======
  893. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  894. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= =======
  895. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= =======
  896. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
  897. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  898. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= =======
  899. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  900. <<<<<<< HEAD
  901. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
  902. =======
  903. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  904. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) =======
  905. >>>>>>> 4e81ea2 (Featire specs) =======
  906. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) =======
  907. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  908. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= =======
  909. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= =======
  910. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
  911. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  912. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= =======
  913. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) 5 <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) find('a', class: 'dropdown-toggle lead small', text: I18n.t('catalog_page.sorting.newer_first'),
  914. id: 'menu').click <<<<<<< HEAD ======= ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> 4e81ea2 (Featire specs) ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  915. 5 within 'ul', class: 'dropdown-menu', id: 'sort' do
  916. 5 click_link button
  917. end
  918. 5 expect(find('.col-xs-6.col-sm-3', match: :first)).to have_content(book_title)
  919. end
  920. end
  921. 1 context 'when sort by title A to Z' do
  922. 2 <<<<<<< HEAD let(:button) { I18n.t('catalog_page.sorting.title.asc') } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) let(:button) { I18n.t('catalog_page.sorting.title.asc') } ======= let(:button) { 'Title: A to Z' } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= let(:button) { 'Title: A to Z' } >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= let(:button) { 'Title: A to Z' } >>>>>>> 4e81ea2 (Featire specs) ======= let(:button) { 'Title: A to Z' } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= let(:button) { 'Title: A to Z' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:button) { 'Title: A to Z' } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= let(:button) { 'Title: A to Z' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= let(:button) { 'Title: A to Z' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= let(:button) { 'Title: A to Z' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:button) { 'Title: A to Z' } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= let(:button) { 'Title: A to Z' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  923. 2 let(:book_title) { 'Anna' }
  924. 1 include_examples 'sort test'
  925. end
  926. 1 context 'when sort by title Z to A' do
  927. 2 <<<<<<< HEAD let(:button) { I18n.t('catalog_page.sorting.title.desc') } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) let(:button) { I18n.t('catalog_page.sorting.title.desc') } ======= let(:button) { 'Title: Z to A' } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= let(:button) { 'Title: Z to A' } >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= let(:button) { 'Title: Z to A' } >>>>>>> 4e81ea2 (Featire specs) ======= let(:button) { 'Title: Z to A' } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= let(:button) { 'Title: Z to A' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:button) { 'Title: Z to A' } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= let(:button) { 'Title: Z to A' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= let(:button) { 'Title: Z to A' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= let(:button) { 'Title: Z to A' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:button) { 'Title: Z to A' } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= let(:button) { 'Title: Z to A' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  928. 2 let(:book_title) { 'Zimbabwe' }
  929. 1 include_examples 'sort test'
  930. end
  931. 1 context 'when sort by price High to Low' do
  932. 2 <<<<<<< HEAD let(:button) { I18n.t('catalog_page.sorting.price.desc') } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) let(:button) { I18n.t('catalog_page.sorting.price.desc') } ======= let(:button) { 'Price: High to Low' } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= let(:button) { 'Price: High to Low' } >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= let(:button) { 'Price: High to Low' } >>>>>>> 4e81ea2 (Featire specs) ======= let(:button) { 'Price: High to Low' } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= let(:button) { 'Price: High to Low' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:button) { 'Price: High to Low' } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= let(:button) { 'Price: High to Low' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= let(:button) { 'Price: High to Low' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= let(:button) { 'Price: High to Low' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:button) { 'Price: High to Low' } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= let(:button) { 'Price: High to Low' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  933. 2 let(:book_title) { 'Zimbabwe' }
  934. 1 include_examples 'sort test'
  935. end
  936. 1 context 'when sort by price Low to High' do
  937. 2 <<<<<<< HEAD let(:button) { I18n.t('catalog_page.sorting.price.asc') } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) let(:button) { I18n.t('catalog_page.sorting.price.asc') } ======= let(:button) { 'Price: Low to High' } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= let(:button) { 'Price: Low to High' } >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= let(:button) { 'Price: Low to High' } >>>>>>> 4e81ea2 (Featire specs) ======= let(:button) { 'Price: Low to High' } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= let(:button) { 'Price: Low to High' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:button) { 'Price: Low to High' } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= let(:button) { 'Price: Low to High' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= let(:button) { 'Price: Low to High' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= let(:button) { 'Price: Low to High' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:button) { 'Price: Low to High' } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= let(:button) { 'Price: Low to High' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  938. 2 let(:book_title) { 'Anna' }
  939. 1 include_examples 'sort test'
  940. end
  941. 1 context 'when sort by newest' do
  942. 2 <<<<<<< HEAD let(:button) { I18n.t('catalog_page.sorting.newer_first') } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) let(:button) { I18n.t('catalog_page.sorting.newer_first') } ======= let(:button) { 'Newest first' } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= let(:button) { 'Newest first' } >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= let(:button) { 'Newest first' } >>>>>>> 4e81ea2 (Featire specs) ======= let(:button) { 'Newest first' } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= let(:button) { 'Newest first' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:button) { 'Newest first' } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= let(:button) { 'Newest first' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= let(:button) { 'Newest first' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= let(:button) { 'Newest first' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:button) { 'Newest first' } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= let(:button) { 'Newest first' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  943. 2 let(:book_title) { 'Zimbabwe' }
  944. 1 include_examples 'sort test'
  945. end
  946. end
  947. end

spec/feature/home_spec.rb

100.0% lines covered

<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) 49 relevant lines. 49 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe 'Home', type: :feature do
  2. 1 include_context 'with api request authentication helper methods'
  3. 1 include_context 'with api request global before and after hooks'
  4. 1 describe 'Get Started' do
  5. 1 it 'on click move to catalog page' do
  6. 1 visit root_path
  7. 1 click_on 'Get Started'
  8. 1 expect(page).to have_content('Catalog')
  9. end
  10. end
  11. 1 describe 'navbar' do
  12. 2 let(:books_category) { create(:books_category) }
  13. 1 it 'on click home move to root-path' do
  14. 1 visit books_path
  15. 1 find('a', id: 'root').click
  16. 1 expect(page).to have_content('Get Started')
  17. end
  18. 1 it 'on click category name move to root-path with books that belong to this category' do
  19. 1 books_category
  20. 1 visit root_path
  21. 1 find('a', class: 'dropdown-toggle', text: 'Shop').click
  22. 1 within('ul', id: 'nav') do
  23. 1 find('a', class: 'collapse-link', text: books_category.category.name).click
  24. end
  25. 1 expect(page).to have_content(books_category.category.books.first.title)
  26. end
  27. 1 context 'when guest' do
  28. 1 it 'on click login go to login page' do
  29. 1 visit root_path
  30. 1 within 'div', class: 'visible-xs' do
  31. 1 click_link I18n.t('header.log_in')
  32. end
  33. 1 expect(page).to have_content(I18n.t('header.log_in'))
  34. end
  35. 1 it 'on click sing up go to sing up page' do
  36. 1 visit root_path
  37. 1 within 'div', class: 'visible-xs' do
  38. 1 click_link I18n.t('header.sing_up')
  39. end
  40. 1 expect(page).to have_content(I18n.t('header.sing_up'))
  41. end
  42. end
  43. 1 context 'when user', js: true do
  44. 4 let(:user) { create(:user) }
  45. 1 before do
  46. 3 sign_in(user)
  47. end
  48. 1 it 'on click account show settings' do
  49. 1 visit root_path
  50. 1 click_on I18n.t('header.account')
  51. 1 expect(page).to have_content(I18n.t('header.settings'))
  52. end
  53. 1 it 'on click account show log_out' do
  54. 1 visit root_path
  55. 1 click_on I18n.t('header.account')
  56. 1 expect(page).to have_content(I18n.t('header.log_out'))
  57. end
  58. 1 it 'log_out' do
  59. 1 visit root_path
  60. 1 click_on I18n.t('header.account')
  61. 1 click_on(I18n.t('header.log_out'), match: :first)
  62. 1 expect(page).to have_content(I18n.t('devise.sessions.signed_out'))
  63. end
  64. end
  65. end
  66. end

spec/feature/login_spec.rb

100.0% lines covered

19 relevant lines. 19 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe 'Login', type: :feature do
  2. 3 let(:user_second) { create(:user, email: 'test.rspec@rspec.ua') }
  3. 1 describe '#login' do
  4. 1 before do
  5. 2 visit new_user_session_path
  6. end
  7. 1 context 'when successfully login' do
  8. 1 it 'login' do
  9. 1 within 'form', class: 'new_user', id: 'new_user' do
  10. 1 fill_in 'user_email', with: user_second.email
  11. 1 fill_in 'user_password', with: user_second.password
  12. 1 click_on I18n.t('header.log_in')
  13. end
  14. 1 expect(page).to have_text I18n.t('devise.sessions.signed_in')
  15. end
  16. end
  17. 1 context 'when unsuccessfully login' do
  18. 1 it 'didn`t login' do
  19. 1 within 'form', class: 'new_user', id: 'new_user' do
  20. 1 fill_in 'user_email', with: user_second.email
  21. 1 fill_in 'user_password', with: 'wrong_password'
  22. 1 click_on I18n.t('header.log_in')
  23. end
  24. 1 expect(page).to have_text 'Invalid Email or password.'
  25. end
  26. end
  27. end
  28. end

spec/feature/new_password_spec.rb

100.0% lines covered

13 relevant lines. 13 lines covered and 0 lines missed.
    
  1. 1 require_relative '../rails_helper'
  2. 1 require_relative '../support/shared_context'
  3. 1 RSpec.describe 'New Password', type: :feature do
  4. 3 let(:user) { FactoryBot.create(:user) }
  5. 1 describe '#new_password' do
  6. 1 it 'change password' do
  7. 1 user.reset_password('newPassword', 'newPassword')
  8. 1 expect(user.password).to eq('newPassword')
  9. end
  10. 1 it 'not validate password' do
  11. 1 visit new_user_password_path
  12. 1 fill_in 'email', with: user.email
  13. 1 click_on I18n.t('login.send_instructions')
  14. 1 expect(page).to have_content(I18n.t('devise.passwords.send_instructions'))
  15. end
  16. end
  17. end

spec/feature/registration_spec.rb

100.0% lines covered

29 relevant lines. 29 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe 'Registration', type: :feature do
  2. 3 let(:user) { create(:user, email: 'test.rspec@rspec.ua') }
  3. 1 describe '#sing_up' do
  4. 1 before do
  5. 3 visit new_user_registration_path
  6. end
  7. 1 context 'when successfully sing_up' do
  8. 1 it 'sing_up users' do
  9. 1 within 'form', class: 'new_user', id: 'new_user' do
  10. 1 fill_in 'user_email', with: 'email-test@rspec.com'
  11. 1 fill_in 'user_password', with: user.password
  12. 1 fill_in 'user_password_confirmation', with: user.password
  13. 1 click_on I18n.t('header.sing_up')
  14. end
  15. 1 expect(page).to have_text I18n.t('devise.registrations.signed_up_but_unconfirmed')
  16. end
  17. end
  18. 1 context 'when users is already exits' do
  19. 1 it 'sing_up users' do
  20. 1 within 'form', class: 'new_user', id: 'new_user' do
  21. 1 fill_in 'user_email', with: user.email
  22. 1 fill_in 'user_password', with: user.password
  23. 1 fill_in 'user_password_confirmation', with: user.password
  24. 1 click_on I18n.t('header.sing_up')
  25. end
  26. 1 expect(page).to have_text('Email has already been taken')
  27. end
  28. end
  29. 1 context 'when unsuccessfully sing_up' do
  30. 1 it 'didn`t sing_up' do
  31. 1 within 'form', class: 'new_user', id: 'new_user' do
  32. 1 fill_in 'user_email', with: FFaker::Internet.email
  33. 1 fill_in 'user_password', with: 'password'
  34. 1 fill_in 'user_password_confirmation', with: 'wrong'
  35. 1 click_on I18n.t('header.sing_up')
  36. end
  37. 1 expect(page).to have_text '1 error prohibited this user from being saved'
  38. end
  39. end
  40. end
  41. end

spec/feature/review_spec.rb

100.0% lines covered

30 relevant lines. 30 lines covered and 0 lines missed.
    
  1. 1 require_relative '../rails_helper'
  2. 1 require_relative '../support/shared_context'
  3. 1 RSpec.describe 'Review', type: :feature do
  4. 1 include_context 'with api request authentication helper methods'
  5. 1 include_context 'with api request global before and after hooks'
  6. 3 let(:user) { FactoryBot.create(:user).decorate }
  7. 3 let(:book) { FactoryBot.create(:book).decorate }
  8. 1 before do
  9. 2 sign_in(user)
  10. 2 visit book_path(book)
  11. end
  12. 1 shared_examples 'review' do
  13. 2 it 'review' do
  14. 2 find('i', id: rating).click
  15. 2 fill_in :title, with: FFaker::Lorem.sentence(title_words)
  16. 2 fill_in :body, with: FFaker::Lorem.sentence(body_words)
  17. 2 click_on I18n.t('review.post')
  18. 2 expect(page).to have_content(result)
  19. end
  20. end
  21. 1 describe '#post review', js: true do
  22. 1 context 'when review posted' do
  23. 2 let(:rating) { "star#{rand(1..5)}" }
  24. 2 let(:title_words) { 5 }
  25. 2 let(:body_words) { 10 }
  26. 2 let(:result) { user.name_or_email }
  27. 1 include_examples 'review'
  28. end
  29. 1 context 'when review not been posted' do
  30. 2 let(:rating) { "star#{rand(1..5)}" }
  31. 2 let(:title_words) { 80 }
  32. 2 let(:body_words) { 30 }
  33. 2 let(:result) { 'Title is too long (maximum is 80 characters)' }
  34. 1 include_examples 'review'
  35. end
  36. end
  37. end

spec/feature/settings_spec.rb

100.0% lines covered

34 relevant lines. 34 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe 'Settings', type: :feature do
  2. 1 include_context 'with api request authentication helper methods'
  3. 1 include_context 'with api request global before and after hooks'
  4. 4 let(:user) { create(:user) }
  5. 1 before do
  6. 3 sign_in(user)
  7. 3 visit edit_user_path(user.id)
  8. 3 click_link I18n.t('settings.privacy')
  9. end
  10. 1 describe '#email_change' do
  11. 1 it 'change email' do
  12. 1 within('div', id: 'email') do
  13. 1 fill_in :email, with: FFaker::Internet.email
  14. 1 click_on I18n.t('settings.save')
  15. end
  16. 1 user.confirm
  17. 1 expect(page).to have_content(I18n.t('settings.message.update'))
  18. end
  19. end
  20. 1 describe '#password_change' do
  21. 1 context 'when error' do
  22. 1 it 'didnt change password' do
  23. 1 within('div', id: 'password') do
  24. 1 fill_in :current_password, with: user.password
  25. 1 fill_in :password, with: 'newPassword'
  26. 1 fill_in :password_confirmation, with: 'incorrectPassword'
  27. 1 click_on I18n.t('settings.save')
  28. end
  29. 1 user.confirm
  30. 1 expect(page).to have_content(I18n.t('settings.error.error'))
  31. end
  32. end
  33. 1 context 'when successful' do
  34. 1 it 'didnt change password' do
  35. 1 within('div', id: 'password') do
  36. 1 fill_in :current_password, with: user.password
  37. 1 fill_in :password, with: 'newPassword'
  38. 1 fill_in :password_confirmation, with: 'newPassword'
  39. 1 click_on I18n.t('settings.save')
  40. end
  41. 1 user.confirm
  42. 1 expect(page).to have_content(I18n.t('devise.failure.unauthenticated'))
  43. end
  44. end
  45. end
  46. end

spec/feature/shipping_spec.rb

73.08% lines covered

26 relevant lines. 19 lines covered and 7 lines missed.
    
  1. 1 RSpec.describe 'Shipping', type: :feature do
  2. 1 include_context 'with api request authentication helper methods'
  3. 1 include_context 'with api request global before and after hooks'
  4. 2 let(:user) { FactoryBot.create(:user) }
  5. 1 let(:attributes_for) { attributes_for(:shipping) }
  6. 1 describe '#fill_in', js: true do
  7. 1 it 'fill in shipping' do
  8. 1 sign_in(user)
  9. 1 visit edit_user_path(user.id)
  10. 1 within('div#shipping.col-md-5.mb-40') do
  11. 1 find_all('div', class: 'form-group')[0] do
  12. fill_in :first_name, with: attributes_for[:first_name]
  13. end
  14. 1 find_all('div', class: 'form-group')[1] do
  15. fill_in :last_name, with: attributes_for[:last_name]
  16. end
  17. 1 find_all('div', class: 'form-group')[2] do
  18. fill_in :address, with: attributes_for[:address]
  19. end
  20. 1 find_all('div', class: 'form-group')[3] do
  21. fill_in :city, with: attributes_for[:city]
  22. end
  23. 1 find_all('div', class: 'form-group')[4] do
  24. fill_in :zip, with: attributes_for[:zip]
  25. end
  26. 1 find_all('div', class: 'form-group')[5] do
  27. fill_in :country, with: attributes_for[:country]
  28. end
  29. 1 find_all('div', class: 'form-group')[6] do
  30. fill_in :phone, with: attributes_for[:phone]
  31. end
  32. 1 click_on I18n.t('settings.save')
  33. end
  34. 1 expect(page).to have_content(I18n.t('settings.message.update'))
  35. end
  36. end
  37. end

spec/feature/user_spec.rb

100.0% lines covered

42 relevant lines. 42 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe 'User', type: :feature do
  2. 2 let(:user) { build(:user, email: 'test.rspec@rspec.ua') }
  3. 3 let(:user_second) { create(:user, email: 'test.rspec-test@rspec.ua') }
  4. 1 describe '#sing_up' do
  5. 1 context 'when successfully sing_up' do
  6. 1 before do
  7. 1 visit new_user_registration_path
  8. 1 within 'form', class: 'new_user', id: 'new_user' do
  9. 1 fill_in 'user_email', with: user.email
  10. 1 fill_in 'user_password', with: user.password
  11. 1 fill_in 'user_password_confirmation', with: user.password
  12. 1 click_on I18n.t('header.sing_up')
  13. end
  14. end
  15. 1 it 'sing_up user' do
  16. 1 expect(page).to have_text I18n.t('devise.registrations.signed_up_but_unconfirmed')
  17. end
  18. end
  19. 1 context 'when unsuccessfully sing_up' do
  20. 1 it 'didn`t sing_up' do
  21. 1 visit new_user_registration_path
  22. 1 within 'form', class: 'new_user', id: 'new_user' do
  23. 1 fill_in 'user_email', with: FFaker::Internet.email
  24. 1 fill_in 'user_password', with: 'wrong'
  25. 1 fill_in 'user_password_confirmation', with: 'wrong'
  26. 1 click_on I18n.t('header.sing_up')
  27. end
  28. 1 expect(page).to have_text '1 error prohibited this user from being saved'
  29. end
  30. end
  31. end
  32. 1 describe '#login' do
  33. 1 before do
  34. 2 user_second.confirm
  35. end
  36. 1 context 'when successfully login' do
  37. 1 it 'login' do
  38. 1 visit new_user_session_path
  39. 1 within 'form', class: 'new_user', id: 'new_user' do
  40. 1 fill_in 'user_email', with: user_second.email
  41. 1 fill_in 'user_password', with: user_second.password
  42. 1 click_on I18n.t('header.log_in')
  43. end
  44. 1 expect(page).to have_text I18n.t('devise.sessions.signed_in')
  45. end
  46. end
  47. 1 context 'when unsuccessfully login' do
  48. 1 it 'didn`t login' do
  49. 1 visit new_user_session_path
  50. 1 within 'form', class: 'new_user', id: 'new_user' do
  51. 1 fill_in 'user_email', with: user_second.email
  52. 1 fill_in 'user_password', with: 'wrong_password'
  53. 1 click_on I18n.t('header.log_in')
  54. end
  55. 1 expect(page).to have_text 'Invalid Email or password.'
  56. end
  57. end
  58. end
  59. end

spec/models/admin_user_spec.rb

100.0% lines covered

5 relevant lines. 5 lines covered and <<<<<<< HEAD ======= ======= 20 relevant lines. 20 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= 20 relevant lines. 20 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= 20 relevant lines. 20 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 20 relevant lines. 20 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= 20 relevant lines. 20 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 20 relevant lines. 20 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= 20 relevant lines. 20 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= 20 relevant lines. 20 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 20 relevant lines. 20 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= 20 relevant lines. 20 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 20 relevant lines. 20 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= 20 relevant lines. 20 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) 0 lines missed.
    
  1. 1 require 'rails_helper'
  2. 1 <<<<<<< HEAD RSpec.describe AdminUser, type: :model do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) RSpec.describe AdminUser, type: :model do ======= RSpec.describe 'Homes', type: :feature do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= RSpec.describe 'Homes', type: :feature do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD RSpec.describe 'Homes', type: :feature do >>>>>>> 4e81ea2 (Featire specs) ======= RSpec.describe 'Homes', type: :feature do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= RSpec.describe 'Homes', type: :feature do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= RSpec.describe 'Homes', type: :feature do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= RSpec.describe 'Homes', type: :feature do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= RSpec.describe 'Homes', type: :feature do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= RSpec.describe 'Homes', type: :feature do <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= RSpec.describe 'Homes', type: :feature do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= RSpec.describe 'Homes', type: :feature do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= RSpec.describe 'Homes', type: :feature do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= RSpec.describe 'Homes', type: :feature do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  3. 1 <<<<<<< HEAD context 'when validations' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) context 'when validations' do ======= describe 'Get Started' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= describe 'Get Started' do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD describe 'Get Started' do >>>>>>> 4e81ea2 (Featire specs) ======= describe 'Get Started' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= describe 'Get Started' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= describe 'Get Started' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= describe 'Get Started' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= describe 'Get Started' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= describe 'Get Started' do <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= describe 'Get Started' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= describe 'Get Started' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= describe 'Get Started' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= describe 'Get Started' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  4. <<<<<<< HEAD
  5. 2 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
  6. 2 =======
  7. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) =======
  8. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  9. 1 >>>>>>> 4e81ea2 (Featire specs) =======
  10. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= =======
  11. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  12. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= =======
  13. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= =======
  14. 1 >>>>>>> 4e81ea2 (Featire specs) =======
  15. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774f (Featire specs) <<<<<<< HEAD it { is_expected.to validate_presence_of(:email) } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= =======
  16. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  17. 1 >>>>>>> 7a02bbe (Featire specs) =======
  18. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) it { is_expected.to validate_presence_of(:email) } ======= it 'on click move to catalog page' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= it 'on click move to catalog page' do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD it 'on click move to catalog page' do >>>>>>> 4e81ea2 (Featire specs) ======= it 'on click move to catalog page' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= it 'on click move to catalog page' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'on click move to catalog page' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= it 'on click move to catalog page' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= it 'on click move to catalog page' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= it 'on click move to catalog page' do <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it 'on click move to catalog page' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= it 'on click move to catalog page' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'on click move to catalog page' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= it 'on click move to catalog page' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  19. <<<<<<< HEAD
  20. 2 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
  21. 2 =======
  22. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) =======
  23. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  24. 1 >>>>>>> 4e81ea2 (Featire specs) =======
  25. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= =======
  26. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  27. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= =======
  28. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= =======
  29. 1 >>>>>>> 4e81ea2 (Featire specs) =======
  30. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774f (Featire specs) <<<<<<< HEAD it { is_expected.to validate_presence_of(:password) } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= =======
  31. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  32. 1 >>>>>>> 7a02bbe (Featire specs) =======
  33. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) it { is_expected.to validate_presence_of(:password) } ======= visit root_path >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= visit root_path >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD visit root_path >>>>>>> 4e81ea2 (Featire specs) ======= visit root_path >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= visit root_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit root_path >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= visit root_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= visit root_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= visit root_path <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= visit root_path >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= visit root_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit root_path >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= visit root_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  34. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  35. 1 click_on 'Get Started'
  36. 1 expect(page).to have_content('Catalog')
  37. end
  38. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8480924 (Featire specs) ======= >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> 365d41e (Featire specs) ======= ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) end
  39. <<<<<<< HEAD
  40. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
  41. ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= =======
  42. ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD
  43. ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  44. 1 describe 'navbar' do
  45. 2 let(:books_category) { FactoryBot.create(:books_category) }
  46. 1 it 'on click home move to root-path' do
  47. 1 visit books_path
  48. 1 find('a', id: 'root').click
  49. 1 expect(page).to have_content('Get Started')
  50. end
  51. 1 it 'on click category name move to root-path with books that belong to this category' do
  52. 1 books_category
  53. 1 visit root_path
  54. 1 find('a', class: 'dropdown-toggle', text: 'Shop').click
  55. 1 within('ul', id: 'nav') do
  56. 1 find('a', class: 'collapse-link', text: books_category.category.name).click
  57. end
  58. 1 expect(page).to have_content(books_category.category.books.first.title)
  59. end
  60. end
  61. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8480924 (Featire specs) ======= >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> 365d41e (Featire specs) ======= ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) end

spec/models/author_spec.rb

100.0% lines covered

<<<<<<< HEAD 8 relevant lines. 8 lines covered and ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) 8 relevant lines. 8 lines covered and ======= 9 relevant lines. 9 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= 9 relevant lines. 9 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 9 relevant lines. 9 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 9 relevant lines. 9 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) 0 lines missed.
    
  1. 1 <<<<<<< HEAD RSpec.describe Author, type: :model do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) RSpec.describe Author, type: :model do ======= require 'rails_helper' >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= require 'rails_helper' >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD require 'rails_helper' >>>>>>> 4e81ea2 (Featire specs) ======= require 'rails_helper' >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= require 'rails_helper' >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= require 'rails_helper' >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= require 'rails_helper' >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= require 'rails_helper' >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= require 'rails_helper' <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= require 'rails_helper' >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= require 'rails_helper' >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= require 'rails_helper' >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= require 'rails_helper' >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  2. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 365d41e (Featire specs) ======= >>>>>>> c05ee51 (Featire specs) ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  3. 1 describe 'author' do
  4. 1 context 'when validations' do
  5. 2 it { is_expected.to validate_presence_of(:first_name) }
  6. 2 it { is_expected.to validate_presence_of(:last_name) }
  7. end
  8. <<<<<<< HEAD ======= =======
  9. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) =======
  10. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
  11. >>>>>>> 4e81ea2 (Featire specs) =======
  12. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= =======
  13. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  14. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= =======
  15. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= =======
  16. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= =======
  17. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
  18. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= =======
  19. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  20. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= =======
  21. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  22. <<<<<<< HEAD
  23. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
  24. =======
  25. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) =======
  26. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
  27. >>>>>>> 4e81ea2 (Featire specs) =======
  28. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= =======
  29. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  30. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= =======
  31. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= =======
  32. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= =======
  33. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
  34. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= =======
  35. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  36. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= =======
  37. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) 1 <<<<<<< HEAD context 'when associations' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) context 'when associations' do ======= RSpec.describe Author, type: :model do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= RSpec.describe Author, type: :model do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD RSpec.describe Author, type: :model do >>>>>>> 4e81ea2 (Featire specs) ======= RSpec.describe Author, type: :model do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= RSpec.describe Author, type: :model do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= RSpec.describe Author, type: :model do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= RSpec.describe Author, type: :model do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= RSpec.describe Author, type: :model do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= RSpec.describe Author, type: :model do <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= RSpec.describe Author, type: :model do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= RSpec.describe Author, type: :model do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= RSpec.describe Author, type: :model do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= RSpec.describe Author, type: :model do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  38. <<<<<<< HEAD
  39. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
  40. ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= =======
  41. ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD
  42. ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  43. 1 describe 'author' do
  44. 1 context 'when validations' do
  45. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8480924 (Featire specs) ======= >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> 365d41e (Featire specs) ======= ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) 2 <<<<<<< HEAD it { is_expected.to have_many(:authors_books).dependent(:destroy) } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) it { is_expected.to have_many(:authors_books).dependent(:destroy) } ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD it { is_expected.to validate_presence_of(:first_name) } >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:first_name) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  46. <<<<<<< HEAD
  47. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
  48. =======
  49. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) =======
  50. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
  51. >>>>>>> 4e81ea2 (Featire specs) =======
  52. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= =======
  53. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  54. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= =======
  55. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= =======
  56. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= =======
  57. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
  58. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= =======
  59. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  60. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= =======
  61. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) 2 <<<<<<< HEAD it { is_expected.to have_many(:books).through(:authors_books) } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) it { is_expected.to have_many(:books).through(:authors_books) } ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD it { is_expected.to validate_presence_of(:last_name) } >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:last_name) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  62. <<<<<<< HEAD
  63. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
  64. =======
  65. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) =======
  66. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
  67. >>>>>>> 4e81ea2 (Featire specs) =======
  68. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= =======
  69. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  70. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= =======
  71. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= =======
  72. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= =======
  73. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
  74. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= =======
  75. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  76. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= =======
  77. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) end
  78. <<<<<<< HEAD
  79. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
  80. ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= =======
  81. ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD
  82. ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  83. 1 context 'when associations' do
  84. 2 it { is_expected.to have_many(:authors_books).dependent(:destroy) }
  85. 2 it { is_expected.to have_many(:books).through(:authors_books) }
  86. end
  87. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8480924 (Featire specs) ======= >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> 365d41e (Featire specs) ======= ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) end
  88. <<<<<<< HEAD
  89. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
  90. =======
  91. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) =======
  92. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
  93. >>>>>>> 4e81ea2 (Featire specs) =======
  94. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= =======
  95. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  96. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= =======
  97. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= =======
  98. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= =======
  99. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
  100. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= =======
  101. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  102. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= =======
  103. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) end

spec/models/authors_book_spec.rb

100.0% lines covered

<<<<<<< HEAD 8 relevant lines. 8 lines covered and ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) 8 relevant lines. 8 lines covered and ======= 9 relevant lines. 9 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= 9 relevant lines. 9 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 9 relevant lines. 9 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 9 relevant lines. 9 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) 0 lines missed.
    
  1. 1 <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) require 'rails_helper'
  2. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8480924 (Featire specs) ======= >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> 365d41e (Featire specs) ======= ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) RSpec.describe AuthorsBook, type: :model do
  3. <<<<<<< HEAD
  4. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
  5. =======
  6. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) =======
  7. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
  8. >>>>>>> 4e81ea2 (Featire specs) =======
  9. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= =======
  10. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  11. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= =======
  12. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= =======
  13. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= =======
  14. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
  15. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= =======
  16. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  17. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= =======
  18. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) 1 describe 'authors_book' do
  19. <<<<<<< HEAD
  20. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
  21. =======
  22. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) =======
  23. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
  24. >>>>>>> 4e81ea2 (Featire specs) =======
  25. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= =======
  26. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  27. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= =======
  28. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= =======
  29. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= =======
  30. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
  31. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= =======
  32. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  33. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= =======
  34. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) 1 context 'when validations' do
  35. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 365d41e (Featire specs) ======= >>>>>>> c05ee51 (Featire specs) ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  36. 2 it { is_expected.to validate_presence_of(:book) }
  37. 2 it { is_expected.to validate_presence_of(:author) }
  38. end
  39. 1 context 'when associations' do
  40. 2 it { is_expected.to belong_to(:author) }
  41. 2 it { is_expected.to belong_to(:book) }
  42. end
  43. end
  44. end

spec/models/billing_spec.rb

100.0% lines covered

20 relevant lines. 20 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe Billing, type: :model do
  2. 1 describe 'billing' do
  3. 1 context 'when validations' do
  4. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:first_name) }
  5. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:last_name) }
  6. <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  7. 2 <<<<<<< HEAD it { is_expected.to allow_values('+919367788755', '8989829304', '+16308520397', '786-307-3615').for(:phone) } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) it { is_expected.to allow_values('+919367788755', '8989829304', '+16308520397', '786-307-3615').for(:phone) } ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD it { is_expected.to validate_presence_of(:book) } >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:book) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  8. 2 <<<<<<< HEAD it { is_expected.to allow_values(FFaker::AddressUK.country).for(:country) } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) it { is_expected.to allow_values(FFaker::AddressUK.country).for(:country) } ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD it { is_expected.to validate_presence_of(:author) } >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:author) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  9. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 365d41e (Featire specs) ======= >>>>>>> c05ee51 (Featire specs) ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  10. 2 it { is_expected.to allow_values(FFaker::AddressUK.city).for(:city) }
  11. 2 it { is_expected.to allow_values(FFaker::AddressUA.zip_code).for(:zip) }
  12. 2 it { is_expected.to allow_values(FFaker::Address.street_address).for(:address) }
  13. <<<<<<< HEAD ======= =======
  14. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) =======
  15. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
  16. >>>>>>> 4e81ea2 (Featire specs) =======
  17. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= =======
  18. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  19. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= =======
  20. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= =======
  21. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= =======
  22. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
  23. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= =======
  24. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  25. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= =======
  26. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) end
  27. <<<<<<< HEAD
  28. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
  29. =======
  30. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) =======
  31. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
  32. >>>>>>> 4e81ea2 (Featire specs) =======
  33. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= =======
  34. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  35. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= =======
  36. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= =======
  37. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= =======
  38. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
  39. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= =======
  40. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  41. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= =======
  42. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  43. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 365d41e (Featire specs) ======= >>>>>>> c05ee51 (Featire specs) ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  44. 1 context 'when not validations' do
  45. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:first_name) }
  46. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:last_name) }
  47. 2 it { is_expected.not_to allow_values('789', '123765', '1-1-1', '+982').for(:phone) }
  48. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:country) }
  49. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:city) }
  50. 2 it { is_expected.not_to allow_values('1' * Constants::VALIDATES_ZIP_LENGTH_MAX.next).for(:zip) }
  51. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:address) }
  52. end
  53. <<<<<<< HEAD ======= =======
  54. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) =======
  55. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
  56. >>>>>>> 4e81ea2 (Featire specs) =======
  57. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= =======
  58. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  59. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= =======
  60. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= =======
  61. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= =======
  62. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
  63. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= =======
  64. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  65. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= =======
  66. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) 1 context 'when associations' do
  67. <<<<<<< HEAD
  68. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
  69. =======
  70. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) =======
  71. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
  72. >>>>>>> 4e81ea2 (Featire specs) =======
  73. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= =======
  74. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  75. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= =======
  76. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= =======
  77. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= =======
  78. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
  79. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= =======
  80. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  81. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= =======
  82. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) 2 <<<<<<< HEAD it { is_expected.to belong_to(:user) } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) it { is_expected.to belong_to(:user) } ======= it { is_expected.to belong_to(:author) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= it { is_expected.to belong_to(:author) } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD it { is_expected.to belong_to(:author) } >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to belong_to(:author) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= it { is_expected.to belong_to(:author) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to belong_to(:author) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= it { is_expected.to belong_to(:author) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= it { is_expected.to belong_to(:author) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= it { is_expected.to belong_to(:author) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to belong_to(:author) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= it { is_expected.to belong_to(:author) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to belong_to(:author) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= it { is_expected.to belong_to(:author) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  83. <<<<<<< HEAD
  84. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
  85. ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= =======
  86. ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD
  87. ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  88. 2 it { is_expected.to belong_to(:book) }
  89. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8480924 (Featire specs) ======= >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> 365d41e (Featire specs) ======= ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) end
  90. <<<<<<< HEAD
  91. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
  92. =======
  93. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) =======
  94. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
  95. >>>>>>> 4e81ea2 (Featire specs) =======
  96. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= =======
  97. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  98. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= =======
  99. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= =======
  100. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= =======
  101. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
  102. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= =======
  103. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  104. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= =======
  105. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) end
  106. <<<<<<< HEAD
  107. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
  108. =======
  109. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) =======
  110. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
  111. >>>>>>> 4e81ea2 (Featire specs) =======
  112. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= =======
  113. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  114. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= =======
  115. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= =======
  116. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= =======
  117. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
  118. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= =======
  119. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  120. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= =======
  121. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) end

spec/models/book_spec.rb

100.0% lines covered

16 relevant lines. 16 lines covered and 0 lines missed.
    
  1. 1 <<<<<<< HEAD RSpec.describe Book, type: :model do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) RSpec.describe Book, type: :model do ======= require 'rails_helper' >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= require 'rails_helper' >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD require 'rails_helper' >>>>>>> 4e81ea2 (Featire specs) ======= require 'rails_helper' >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= require 'rails_helper' >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= require 'rails_helper' >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= require 'rails_helper' >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= require 'rails_helper' >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= require 'rails_helper' <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= require 'rails_helper' >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= require 'rails_helper' >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= require 'rails_helper' >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= require 'rails_helper' >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  2. <<<<<<< HEAD
  3. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
  4. 1 =======
  5. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) =======
  6. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  7. >>>>>>> 4e81ea2 (Featire specs) =======
  8. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= =======
  9. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  10. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= =======
  11. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= =======
  12. >>>>>>> 4e81ea2 (Featire specs) =======
  13. >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774f (Featire specs) <<<<<<< HEAD describe 'books' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= =======
  14. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  15. >>>>>>> 7a02bbe (Featire specs) =======
  16. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) describe 'books' do ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  17. 1 <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) RSpec.describe Book, type: :model do
  18. 1 describe 'books' do
  19. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8480924 (Featire specs) ======= >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> 365d41e (Featire specs) ======= ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) context 'when validations' do
  20. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 365d41e (Featire specs) ======= >>>>>>> c05ee51 (Featire specs) ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  21. 2 it { is_expected.to validate_presence_of(:title) }
  22. 2 it { is_expected.to validate_presence_of(:description) }
  23. <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  24. 2 <<<<<<< HEAD it { is_expected.to allow_values(Constants::MIN_PRICE_IN_CENTS, Constants::MAX_PRICE_IN_CENTS).for(:price_cents) } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) it { is_expected.to allow_values(Constants::MIN_PRICE_IN_CENTS, Constants::MAX_PRICE_IN_CENTS).for(:price_cents) } ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD it { is_expected.to validate_presence_of(:title) } >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:title) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  25. 2 <<<<<<< HEAD it { is_expected.to validate_presence_of(:year_of_publication) } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) it { is_expected.to validate_presence_of(:year_of_publication) } ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD it { is_expected.to validate_presence_of(:description) } >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:description) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  26. 2 <<<<<<< HEAD it { is_expected.to validate_presence_of(:quantity) } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) it { is_expected.to validate_presence_of(:quantity) } ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD it { is_expected.to validate_presence_of(:price) } >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:price) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  27. 2 <<<<<<< HEAD it { is_expected.to validate_presence_of(:materials) } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) it { is_expected.to validate_presence_of(:materials) } ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:year_of_publication) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  28. 2 <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) it { is_expected.to validate_presence_of(:quantity) }
  29. 2 it { is_expected.to validate_presence_of(:materials) }
  30. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8480924 (Featire specs) ======= >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> 365d41e (Featire specs) ======= ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) it { is_expected.to validate_presence_of(:dimensions) }
  31. <<<<<<< HEAD
  32. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
  33. =======
  34. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) =======
  35. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
  36. >>>>>>> 4e81ea2 (Featire specs) =======
  37. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= =======
  38. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  39. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= =======
  40. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= =======
  41. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= =======
  42. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
  43. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= =======
  44. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  45. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= =======
  46. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) end
  47. <<<<<<< HEAD
  48. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
  49. =======
  50. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) =======
  51. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
  52. >>>>>>> 4e81ea2 (Featire specs) =======
  53. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= =======
  54. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  55. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= =======
  56. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= =======
  57. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= =======
  58. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
  59. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= =======
  60. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  61. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= =======
  62. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  63. <<<<<<< HEAD
  64. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
  65. =======
  66. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) =======
  67. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
  68. >>>>>>> 4e81ea2 (Featire specs) =======
  69. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= =======
  70. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  71. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= =======
  72. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= =======
  73. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= =======
  74. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
  75. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= =======
  76. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  77. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= =======
  78. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) 1 context 'when associations' do
  79. <<<<<<< HEAD
  80. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
  81. =======
  82. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) =======
  83. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
  84. >>>>>>> 4e81ea2 (Featire specs) =======
  85. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= =======
  86. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  87. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= =======
  88. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= =======
  89. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= =======
  90. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
  91. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= =======
  92. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  93. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= =======
  94. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) 2 it { is_expected.to have_many(:authors_books).dependent(:destroy) }
  95. <<<<<<< HEAD
  96. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
  97. =======
  98. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) =======
  99. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
  100. >>>>>>> 4e81ea2 (Featire specs) =======
  101. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= =======
  102. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  103. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= =======
  104. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= =======
  105. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= =======
  106. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
  107. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= =======
  108. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  109. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= =======
  110. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) 2 it { is_expected.to have_many(:authors).through(:authors_books) }
  111. <<<<<<< HEAD
  112. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
  113. =======
  114. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) =======
  115. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
  116. >>>>>>> 4e81ea2 (Featire specs) =======
  117. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= =======
  118. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  119. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= =======
  120. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= =======
  121. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= =======
  122. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
  123. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= =======
  124. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  125. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= =======
  126. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  127. <<<<<<< HEAD
  128. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
  129. =======
  130. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) =======
  131. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
  132. >>>>>>> 4e81ea2 (Featire specs) =======
  133. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= =======
  134. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  135. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= =======
  136. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= =======
  137. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= =======
  138. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
  139. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= =======
  140. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  141. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= =======
  142. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) 2 it { is_expected.to have_many(:books_categories).dependent(:destroy) }
  143. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 365d41e (Featire specs) ======= >>>>>>> c05ee51 (Featire specs) ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  144. 2 it { is_expected.to have_many(:categories).through(:books_categories) }
  145. <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  146. 2 <<<<<<< HEAD it { is_expected.to have_many(:reviews).dependent(:destroy) } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) it { is_expected.to have_many(:reviews).dependent(:destroy) } ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= it { is_expected.to have_many(:categories).through(:books_categories) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  147. end
  148. end
  149. end

spec/models/books_category_spec.rb

100.0% lines covered

<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 365d41e (Featire specs) ======= >>>>>>> c05ee51 (Featire specs) ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) 8 relevant lines. 8 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe BooksCategory, type: :model do
  2. 1 describe 'books_categories' do
  3. 1 context 'when validations' do
  4. 2 it { is_expected.to validate_presence_of(:book) }
  5. 2 it { is_expected.to validate_presence_of(:category) }
  6. end
  7. 1 context 'when associations' do
  8. 2 it { is_expected.to belong_to(:category) }
  9. 2 it { is_expected.to belong_to(:book) }
  10. end
  11. end
  12. end

spec/models/category_spec.rb

100.0% lines covered

7 relevant lines. 7 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe Category, type: :model do
  2. 1 describe 'category' do
  3. 1 context 'when validations' do
  4. 2 it { is_expected.to validate_presence_of(:name) }
  5. end
  6. 1 context 'when associations' do
  7. 2 it { is_expected.to have_many(:books_categories).dependent(:destroy) }
  8. 2 it { is_expected.to have_many(:books).through(:books_categories) }
  9. end
  10. end
  11. end

spec/models/review_spec.rb

100.0% lines covered

14 relevant lines. 14 lines covered and <<<<<<< HEAD ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= 9 relevant lines. 9 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 9 relevant lines. 9 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 9 relevant lines. 9 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) 0 lines missed.
    
  1. 1 require 'rails_helper'
  2. 1 <<<<<<< HEAD RSpec.describe Review, type: :model do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) RSpec.describe Review, type: :model do ======= RSpec.describe BooksCategory, type: :model do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= RSpec.describe BooksCategory, type: :model do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD RSpec.describe BooksCategory, type: :model do >>>>>>> 4e81ea2 (Featire specs) ======= RSpec.describe BooksCategory, type: :model do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= RSpec.describe BooksCategory, type: :model do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= RSpec.describe BooksCategory, type: :model do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= RSpec.describe BooksCategory, type: :model do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= RSpec.describe BooksCategory, type: :model do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= RSpec.describe BooksCategory, type: :model do <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= RSpec.describe BooksCategory, type: :model do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= RSpec.describe BooksCategory, type: :model do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= RSpec.describe BooksCategory, type: :model do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= RSpec.describe BooksCategory, type: :model do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  3. 1 <<<<<<< HEAD describe 'review' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) describe 'review' do ======= describe 'books_categories' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= describe 'books_categories' do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD describe 'books_categories' do >>>>>>> 4e81ea2 (Featire specs) ======= describe 'books_categories' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= describe 'books_categories' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= describe 'books_categories' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= describe 'books_categories' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= describe 'books_categories' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= describe 'books_categories' do <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= describe 'books_categories' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= describe 'books_categories' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= describe 'books_categories' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= describe 'books_categories' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  4. 1 context 'when validations' do
  5. 2 <<<<<<< HEAD it { is_expected.to validate_presence_of(:title) } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) it { is_expected.to validate_presence_of(:title) } ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD it { is_expected.to validate_presence_of(:book) } >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:book) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  6. 2 <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 365d41e (Featire specs) ======= >>>>>>> c05ee51 (Featire specs) ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) it { is_expected.to validate_presence_of(:body) }
  7. 2 it { is_expected.to validate_presence_of(:rating) }
  8. 2 it { is_expected.to validate_presence_of(:verified) }
  9. 2 it { is_expected.to allow_values('a' * Constants::VALIDATES_TITLE_LENGTH_MAX).for(:title) }
  10. 2 it { is_expected.to allow_values('a' * Constants::VALIDATES_TEXT_LENGTH_MAX).for(:body) }
  11. 2 it { is_expected.to allow_values(1, 2, 3, 4, 5).for(:rating) }
  12. end
  13. 1 context 'when associations' do
  14. 2 it { is_expected.to belong_to(:book) }
  15. 2 it { is_expected.to belong_to(:user) }
  16. end
  17. end
  18. end

spec/models/shipping_spec.rb

100.0% lines covered

20 relevant lines. 20 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe Shipping, type: :model do
  2. 1 describe 'shipping' do
  3. 1 context 'when validations' do
  4. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:first_name) }
  5. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:last_name) }
  6. 2 it { is_expected.to allow_values('+919367788755', '8989829304', '+16308520397', '786-307-3615').for(:phone) }
  7. 2 it { is_expected.to allow_values(FFaker::AddressUK.country).for(:country) }
  8. 2 it { is_expected.to allow_values(FFaker::AddressUK.city).for(:city) }
  9. 2 it { is_expected.to allow_values(FFaker::AddressUA.zip_code).for(:zip) }
  10. 2 it { is_expected.to allow_values(FFaker::Address.street_address).for(:address) }
  11. end
  12. 1 context 'when not validations' do
  13. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:first_name) }
  14. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:last_name) }
  15. 2 it { is_expected.not_to allow_values('789', '123765', '1-1-1', '+982').for(:phone) }
  16. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:country) }
  17. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:city) }
  18. 2 it { is_expected.not_to allow_values('1' * Constants::VALIDATES_ZIP_LENGTH_MAX.next).for(:zip) }
  19. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:address) }
  20. end
  21. 1 context 'when associations' do
  22. 2 it { is_expected.to belong_to(:user) }
  23. end
  24. end
  25. end

spec/models/user_spec.rb

100.0% lines covered

9 relevant lines. 9 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe User, type: :model do
  2. 1 let(:user) { FactoryBot.create(:user) }
  3. 1 describe 'author' do
  4. 1 context 'when validations' do
  5. 2 it { is_expected.to validate_presence_of(:email) }
  6. 2 it { is_expected.to validate_presence_of(:password) } <<<<<<< HEAD ======= ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD it { is_expected.to validate_presence_of(:category) } >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:category) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  7. end
  8. 1 <<<<<<< HEAD context 'with associations' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) context 'with associations' do ======= context 'when associations' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= context 'when associations' do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD context 'when associations' do >>>>>>> 4e81ea2 (Featire specs) ======= context 'when associations' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= context 'when associations' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= context 'when associations' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= context 'when associations' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= context 'when associations' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= context 'when associations' do <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= context 'when associations' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= context 'when associations' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= context 'when associations' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= context 'when associations' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  9. 2 <<<<<<< HEAD it { is_expected.to have_one(:billing) } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) it { is_expected.to have_one(:billing) } ======= it { is_expected.to belong_to(:category) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= it { is_expected.to belong_to(:category) } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD it { is_expected.to belong_to(:category) } >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to belong_to(:category) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= it { is_expected.to belong_to(:category) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to belong_to(:category) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= it { is_expected.to belong_to(:category) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= it { is_expected.to belong_to(:category) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= it { is_expected.to belong_to(:category) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to belong_to(:category) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= it { is_expected.to belong_to(:category) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to belong_to(:category) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= it { is_expected.to belong_to(:category) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  10. 2 <<<<<<< HEAD it { is_expected.to have_one(:shipping) } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) it { is_expected.to have_one(:shipping) } ======= it { is_expected.to belong_to(:book) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= it { is_expected.to belong_to(:book) } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD it { is_expected.to belong_to(:book) } >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to belong_to(:book) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= it { is_expected.to belong_to(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to belong_to(:book) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= it { is_expected.to belong_to(:book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= it { is_expected.to belong_to(:book) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= it { is_expected.to belong_to(:book) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to belong_to(:book) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= it { is_expected.to belong_to(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to belong_to(:book) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= it { is_expected.to belong_to(:book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  11. end
  12. end
  13. end
<<<<<<< HEAD

spec/queryes/book_query_spec.rb

======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)

spec/queryes/book_query_spec.rb

=======

spec/models/category_spec.rb

>>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) =======

spec/models/category_spec.rb

>>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======

spec/models/category_spec.rb

>>>>>>> 4e81ea2 (Featire specs) =======

spec/models/category_spec.rb

>>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= =======

spec/models/category_spec.rb

>>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======

spec/models/category_spec.rb

>>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= =======

spec/models/category_spec.rb

>>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= =======

spec/models/category_spec.rb

>>>>>>> 4e81ea2 (Featire specs) =======

spec/models/category_spec.rb

>>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= =======

spec/models/category_spec.rb

>>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======

spec/models/category_spec.rb

>>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= =======

spec/models/category_spec.rb

>>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)

100.0% lines covered

<<<<<<< HEAD 45 relevant lines. 45 lines covered and ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) 45 relevant lines. 45 lines covered and ======= 8 relevant lines. 8 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= 8 relevant lines. 8 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= 8 relevant lines. 8 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 8 relevant lines. 8 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= 8 relevant lines. 8 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 8 relevant lines. 8 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= 8 relevant lines. 8 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= 8 relevant lines. 8 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 8 relevant lines. 8 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= 8 relevant lines. 8 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 8 relevant lines. 8 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= 8 relevant lines. 8 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) 0 lines missed.
    
  1. 1 require 'rails_helper'
  2. 1 <<<<<<< HEAD RSpec.describe BookQuery do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) RSpec.describe BookQuery do ======= RSpec.describe Category, type: :model do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= RSpec.describe Category, type: :model do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD RSpec.describe Category, type: :model do >>>>>>> 4e81ea2 (Featire specs) ======= RSpec.describe Category, type: :model do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= RSpec.describe Category, type: :model do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= RSpec.describe Category, type: :model do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= RSpec.describe Category, type: :model do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= RSpec.describe Category, type: :model do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= RSpec.describe Category, type: :model do <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= RSpec.describe Category, type: :model do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= RSpec.describe Category, type: :model do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= RSpec.describe Category, type: :model do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= RSpec.describe Category, type: :model do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  3. 1 <<<<<<< HEAD shared_examples 'sort test' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) shared_examples 'sort test' do ======= describe 'category' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= describe 'category' do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD describe 'category' do >>>>>>> 4e81ea2 (Featire specs) ======= describe 'category' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= describe 'category' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= describe 'category' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= describe 'category' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= describe 'category' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= describe 'category' do <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= describe 'category' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= describe 'category' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= describe 'category' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= describe 'category' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  4. <<<<<<< HEAD
  5. 5 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
  6. 5 =======
  7. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) =======
  8. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  9. 1 >>>>>>> 4e81ea2 (Featire specs) =======
  10. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= =======
  11. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  12. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= =======
  13. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= =======
  14. 1 >>>>>>> 4e81ea2 (Featire specs) =======
  15. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774f (Featire specs) <<<<<<< HEAD it 'sort' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= =======
  16. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  17. 1 >>>>>>> 7a02bbe (Featire specs) =======
  18. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) it 'sort' do ======= context 'when validations' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= context 'when validations' do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD context 'when validations' do >>>>>>> 4e81ea2 (Featire specs) ======= context 'when validations' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= context 'when validations' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= context 'when validations' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= context 'when validations' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= context 'when validations' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= context 'when validations' do <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= context 'when validations' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= context 'when validations' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= context 'when validations' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= context 'when validations' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  19. <<<<<<< HEAD
  20. 5 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
  21. 5 =======
  22. 2 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) =======
  23. 2 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  24. 2 >>>>>>> 4e81ea2 (Featire specs) =======
  25. 2 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= =======
  26. 2 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  27. 2 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= =======
  28. 2 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= =======
  29. 2 >>>>>>> 4e81ea2 (Featire specs) =======
  30. 2 >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774f (Featire specs) <<<<<<< HEAD books ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= =======
  31. 2 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  32. 2 >>>>>>> 7a02bbe (Featire specs) =======
  33. 2 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) books ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD it { is_expected.to validate_presence_of(:name) } >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:name) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  34. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 365d41e (Featire specs) ======= >>>>>>> c05ee51 (Featire specs) ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  35. 5 expect(test).to eq(result)
  36. <<<<<<< HEAD ======= =======
  37. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) =======
  38. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
  39. >>>>>>> 4e81ea2 (Featire specs) =======
  40. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= =======
  41. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  42. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= =======
  43. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= =======
  44. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= =======
  45. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
  46. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= =======
  47. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  48. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= =======
  49. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) end
  50. <<<<<<< HEAD
  51. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
  52. ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= =======
  53. ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD
  54. ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  55. 1 context 'when associations' do
  56. 2 it { is_expected.to have_many(:books_categories).dependent(:destroy) }
  57. 2 it { is_expected.to have_many(:books).through(:books_categories) }
  58. end
  59. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8480924 (Featire specs) ======= >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> 365d41e (Featire specs) ======= ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) end
  60. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) >>>>>>> a636fda (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  61. end
<<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f92 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> 78717cc (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 365d41e (Featire specs) >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> c05ee51 (Featire specs) ======= >>>>>>> df37394 (Featire specs) >>>>>>> 4f4ea3f (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5890c2 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 4f4ea3f (Featire specs) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f92 (Add login registration pages) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3 (Add login registration pages) ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages) >>>>>>> 29e1af9 (Add login registration pages)

spec/models/user_spec.rb

100.0% lines covered

3 relevant lines. 3 lines covered and 0 lines missed.
    
  1. 1 require 'rails_helper'
  2. 1 RSpec.describe User, type: :model do
  3. 1 pending "add some examples to (or delete) #{__FILE__}"
  4. end
<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f92 (Add login registration pages) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) >>>>>>> 8249ff3 (Add login registration pages) ======= ======= >>>>>>> 8480924 (Featire specs) ======= >>>>>>> 4f4ea3f (Featire specs) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024 (Add login registration pages) ======= ======= >>>>>>> 29e1af9 (Add login registration pages) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages) >>>>>>> 29e1af9 (Add login registration pages) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 84d0df6 (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774f (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3 (Add login registration pages) ======= >>>>>>> 8480924 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 78717cc (Manifest_cache true) ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 98beee2 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f92 (Add login registration pages) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024 (Add login registration pages) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD ======= ======= ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages) >>>>>>> 29e1af9 (Add login registration pages)

spec/rails_helper.rb

87.5% lines covered

16 relevant lines. 14 lines covered and 2 lines missed.
    
  1. 1 require 'spec_helper'
  2. 1 ENV['RAILS_ENV'] ||= 'test'
  3. 1 require_relative '../config/environment'
  4. 1 abort('The Rails environment is running in production mode!') if Rails.env.production?
  5. 1 require 'rspec/rails'
  6. 1 require 'shoulda-matchers'
  7. 1 require_relative 'support/configs/shoulda_matcher'
  8. 1 require_relative 'support/configs/capybara'
  9. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> d8abfed (Featire specs)
  10. <<<<<<< HEAD
  11. 3 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs)
  12. 3 =======
  13. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) =======
  14. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  15. >>>>>>> 4e81ea2 (Featire specs) =======
  16. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= =======
  17. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= =======
  18. >>>>>>> 4e81ea2 (Featire specs) =======
  19. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= =======
  20. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> d8abfed (Featire specs) <<<<<<< HEAD let(:titles) { %w[Adam Zimbabwe] } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) let(:titles) { %w[Adam Zimbabwe] } ======= begin >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= begin >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD begin >>>>>>> 4e81ea2 (Featire specs) ======= begin >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= begin >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= begin >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= begin <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= begin >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= begin >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> d8abfed (Featire specs)
  21. 1 <<<<<<< HEAD let(:books_dates) do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) let(:books_dates) do ======= ActiveRecord::Migration.maintain_test_schema! >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ActiveRecord::Migration.maintain_test_schema! >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD ActiveRecord::Migration.maintain_test_schema! >>>>>>> 4e81ea2 (Featire specs) ======= ActiveRecord::Migration.maintain_test_schema! >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= ActiveRecord::Migration.maintain_test_schema! >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= ActiveRecord::Migration.maintain_test_schema! >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= ActiveRecord::Migration.maintain_test_schema! <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= ActiveRecord::Migration.maintain_test_schema! >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= ActiveRecord::Migration.maintain_test_schema! >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> d8abfed (Featire specs)
  22. <<<<<<< HEAD
  23. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs)
  24. 1 =======
  25. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) =======
  26. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  27. >>>>>>> 4e81ea2 (Featire specs) =======
  28. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= =======
  29. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= =======
  30. >>>>>>> 4e81ea2 (Featire specs) =======
  31. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= =======
  32. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> d8abfed (Featire specs) <<<<<<< HEAD ['Thu, 25 Aug 2022 15:25:38.761014000 UTC +00:00', 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00'] ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ['Thu, 25 Aug 2022 15:25:38.761014000 UTC +00:00', 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00'] ======= rescue ActiveRecord::PendingMigrationError => e >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= rescue ActiveRecord::PendingMigrationError => e >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD rescue ActiveRecord::PendingMigrationError => e >>>>>>> 4e81ea2 (Featire specs) ======= rescue ActiveRecord::PendingMigrationError => e >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= rescue ActiveRecord::PendingMigrationError => e >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= rescue ActiveRecord::PendingMigrationError => e >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= rescue ActiveRecord::PendingMigrationError => e <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= rescue ActiveRecord::PendingMigrationError => e >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= rescue ActiveRecord::PendingMigrationError => e >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> d8abfed (Featire specs)
  33. <<<<<<< HEAD
  34. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs)
  35. =======
  36. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) =======
  37. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
  38. >>>>>>> 4e81ea2 (Featire specs) =======
  39. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= =======
  40. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= =======
  41. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= =======
  42. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
  43. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= =======
  44. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> d8abfed (Featire specs) <<<<<<< HEAD end ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) end ======= puts e.to_s.strip >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= puts e.to_s.strip >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD puts e.to_s.strip >>>>>>> 4e81ea2 (Featire specs) ======= puts e.to_s.strip >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= puts e.to_s.strip >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= puts e.to_s.strip >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= puts e.to_s.strip <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= puts e.to_s.strip >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= puts e.to_s.strip >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> d8abfed (Featire specs)
  45. <<<<<<< HEAD
  46. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs)
  47. ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) =======
  48. ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD
  49. ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs)
  50. exit 1
  51. end
  52. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> d8abfed (Featire specs)
  53. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 365d41e (Featire specs) ======= >>>>>>> c05ee51 (Featire specs) ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> d8abfed (Featire specs)
  54. 1 describe 'all books sort' do
  55. 1 context 'when sort by title A to Z' do
  56. <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> d8abfed (Featire specs)
  57. 1 <<<<<<< HEAD let(:books) do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) let(:books) do ======= RSpec.configure do |config| >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= RSpec.configure do |config| >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD RSpec.configure do |config| >>>>>>> 4e81ea2 (Featire specs) ======= RSpec.configure do |config| >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= RSpec.configure do |config| >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= RSpec.configure do |config| >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= RSpec.configure do |config| <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= RSpec.configure do |config| >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= RSpec.configure do |config| >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> d8abfed (Featire specs)
  58. 1 <<<<<<< HEAD create(:book, title: titles.first) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) create(:book, title: titles.first) ======= config.fixture_path = "#{::Rails.root}/spec/fixtures" >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= config.fixture_path = "#{::Rails.root}/spec/fixtures" >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD config.fixture_path = "#{::Rails.root}/spec/fixtures" >>>>>>> 4e81ea2 (Featire specs) ======= config.fixture_path = "#{::Rails.root}/spec/fixtures" >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= config.fixture_path = "#{::Rails.root}/spec/fixtures" >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= config.fixture_path = "#{::Rails.root}/spec/fixtures" >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= config.fixture_path = "#{::Rails.root}/spec/fixtures" <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= config.fixture_path = "#{::Rails.root}/spec/fixtures" >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= config.fixture_path = "#{::Rails.root}/spec/fixtures" >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> d8abfed (Featire specs)
  59. 1 <<<<<<< HEAD create(:book, title: titles.second) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) create(:book, title: titles.second) ======= config.use_transactional_fixtures = true >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= config.use_transactional_fixtures = true >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD config.use_transactional_fixtures = true >>>>>>> 4e81ea2 (Featire specs) ======= config.use_transactional_fixtures = true >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= config.use_transactional_fixtures = true >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= config.use_transactional_fixtures = true >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= config.use_transactional_fixtures = true <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= config.use_transactional_fixtures = true >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= config.use_transactional_fixtures = true >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> d8abfed (Featire specs)
  60. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 365d41e (Featire specs) ======= >>>>>>> c05ee51 (Featire specs) ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> d8abfed (Featire specs)
  61. end
  62. 2 let(:result) { titles.second }
  63. 2 let(:test) { described_class.query({ sort: 'title DESC' }).first.title }
  64. <<<<<<< HEAD ======= =======
  65. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) =======
  66. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
  67. >>>>>>> 4e81ea2 (Featire specs) =======
  68. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= =======
  69. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= =======
  70. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= =======
  71. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
  72. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= =======
  73. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> d8abfed (Featire specs) 1 <<<<<<< HEAD include_examples 'sort test' ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) include_examples 'sort test' ======= config.infer_spec_type_from_file_location! >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= config.infer_spec_type_from_file_location! >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD config.infer_spec_type_from_file_location! >>>>>>> 4e81ea2 (Featire specs) ======= config.infer_spec_type_from_file_location! >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= config.infer_spec_type_from_file_location! >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= config.infer_spec_type_from_file_location! >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= config.infer_spec_type_from_file_location! <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= config.infer_spec_type_from_file_location! >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= config.infer_spec_type_from_file_location! >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> d8abfed (Featire specs)
  74. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 365d41e (Featire specs) ======= >>>>>>> c05ee51 (Featire specs) ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> d8abfed (Featire specs)
  75. end
  76. <<<<<<< HEAD ======= =======
  77. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) =======
  78. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
  79. >>>>>>> 4e81ea2 (Featire specs) =======
  80. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= =======
  81. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= =======
  82. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= =======
  83. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
  84. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= =======
  85. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> d8abfed (Featire specs) 1 <<<<<<< HEAD context 'when sort title Z to A' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) context 'when sort title Z to A' do ======= config.filter_rails_from_backtrace! >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= config.filter_rails_from_backtrace! >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD config.filter_rails_from_backtrace! >>>>>>> 4e81ea2 (Featire specs) ======= config.filter_rails_from_backtrace! >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= config.filter_rails_from_backtrace! >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= config.filter_rails_from_backtrace! >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= config.filter_rails_from_backtrace! <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= config.filter_rails_from_backtrace! >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= config.filter_rails_from_backtrace! >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> d8abfed (Featire specs)
  86. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 365d41e (Featire specs) ======= >>>>>>> c05ee51 (Featire specs) ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> d8abfed (Featire specs)
  87. 1 let(:books) do
  88. 1 create(:book, title: titles.first)
  89. 1 create(:book, title: titles.second)
  90. end
  91. 2 let(:result) { titles.first }
  92. 2 let(:test) { described_class.query({ sort: 'title' }).first.title }
  93. 1 include_examples 'sort test'
  94. end
  95. 1 context 'when sort by price High to Low' do
  96. 1 let(:books) do
  97. 1 create(:book, price_cents: 75)
  98. 1 create(:book, price_cents: 23)
  99. end
  100. 2 let(:result) { 75 }
  101. 2 let(:test) { described_class.query({ sort: 'price_cents DESC' }).first.price_cents }
  102. 1 include_examples 'sort test'
  103. end
  104. 1 context 'when sort price Low to High' do
  105. 1 let(:books) do
  106. 1 create(:book, price_cents: 75)
  107. 1 create(:book, price_cents: 23)
  108. end
  109. 2 let(:result) { 23 }
  110. 2 let(:test) { described_class.query({ sort: 'price_cents' }).first.price_cents }
  111. 1 include_examples 'sort test'
  112. end
  113. 1 context 'when sort by Newest' do
  114. 1 let(:books) do
  115. 1 create(:book, created_at: books_dates.first)
  116. 1 create(:book, created_at: books_dates.second)
  117. end
  118. 2 let(:result) { books_dates.first }
  119. 2 let(:test) { described_class.query({ sort: 'created_at DESC' }).first.created_at }
  120. 1 include_examples 'sort test'
  121. end
  122. end
  123. <<<<<<< HEAD ======= =======
  124. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) =======
  125. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
  126. >>>>>>> 4e81ea2 (Featire specs) =======
  127. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= =======
  128. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= =======
  129. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= =======
  130. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
  131. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= =======
  132. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> d8abfed (Featire specs) end
<<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 311e9fa (Rebased)

spec/support/configs/capybara.rb

<<<<<<< HEAD <<<<<<< HEAD 100.0% ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 4f4ea3f (Featire specs) ======= >>>>>>> c05ee51 (Featire specs) <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> d8dd3b4 (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) 36.84% ======= <<<<<<< HEAD 100.0% ======= 36.84% >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= >>>>>>> d8dd3b4 (Featire specs) ======= ======= 100.0% >>>>>>> 752f0c0 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= 100.0% >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= 36.84% >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 8480924 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= 100.0% >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) ======= 36.84% >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 9440753 (Featire specs) ======= 100.0% >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= ======= 36.84% >>>>>>> 183b6c5 (Manifest_cache true) ======= ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= 36.84% >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 824bb2b (Featire specs) ======= 100.0% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= >>>>>>> 8480924 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> d8abfed (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 824bb2b (Featire specs) ======= 100.0% >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 009401d (Featire specs) ======= ======= 36.84% >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 78717cc (Manifest_cache true) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 98beee2 (Manifest_cache true) ======= ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= ======= 100.0% >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= ======= ======= 36.84% >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= ======= 100.0% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= ======= 36.84% >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= 100.0% >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= ======= 36.84% >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= 100.0% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 36.84% >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) >>>>>>> 13fca83 (Rebased) lines covered

19 relevant lines. <<<<<<< HEAD <<<<<<< HEAD 19 lines covered and 0 lines missed. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 4f4ea3f (Featire specs) ======= >>>>>>> c05ee51 (Featire specs) <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> d8dd3b4 (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) 7 lines covered and 12 lines missed. ======= <<<<<<< HEAD 19 lines covered and 0 lines missed. ======= 7 lines covered and 12 lines missed. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= >>>>>>> d8dd3b4 (Featire specs) ======= ======= 19 lines covered and 0 lines missed. >>>>>>> 752f0c0 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= 19 lines covered and 0 lines missed. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= 7 lines covered and 12 lines missed. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 8480924 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= 19 lines covered and 0 lines missed. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) ======= 7 lines covered and 12 lines missed. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 9440753 (Featire specs) ======= 19 lines covered and 0 lines missed. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= ======= 7 lines covered and 12 lines missed. >>>>>>> 183b6c5 (Manifest_cache true) ======= ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= 7 lines covered and 12 lines missed. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 824bb2b (Featire specs) ======= 19 lines covered and 0 lines missed. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= >>>>>>> 8480924 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> d8abfed (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 824bb2b (Featire specs) ======= 19 lines covered and 0 lines missed. >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 009401d (Featire specs) ======= ======= 7 lines covered and 12 lines missed. >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 78717cc (Manifest_cache true) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 98beee2 (Manifest_cache true) ======= ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= ======= 19 lines covered and 0 lines missed. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= ======= ======= 7 lines covered and 12 lines missed. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= ======= 19 lines covered and 0 lines missed. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= ======= 7 lines covered and 12 lines missed. >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= 19 lines covered and 0 lines missed. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= ======= 7 lines covered and 12 lines missed. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= 19 lines covered and 0 lines missed. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 7 lines covered and 12 lines missed. >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) >>>>>>> 13fca83 (Rebased)
    
    <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> d8abfed (Featire specs)
  1. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs)
  2. 1 =======
  3. >>>>>>> 752f0c0 (Featire specs) =======
  4. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) =======
  5. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 4f4ea3f (Featire specs) =======
  6. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) =======
  7. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= =======
  8. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= =======
  9. 1 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) >>>>>>> 4f4ea3f (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= >>>>>>> 34509ee (Featire specs) ======= >>>>>>> 75fa7e1 (Rebased) ======= >>>>>>> 8480924 (Featire specs) Capybara.configure do |config| <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) =======
  10. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= =======
  11. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) =======
  12. 1 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) Capybara.configure do |config| <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD Capybara.configure do |config| ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= >>>>>>> 8480924 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774f (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 311e9fa (Rebased)
  13. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 311e9fa (Rebased) =======
  14. >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 4f4ea3f (Featire specs) ======= >>>>>>> 365d41e (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs)
  15. 1 =======
  16. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> a636fda (Featire specs) ======= =======
  17. >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> c05ee51 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> d8dd3b4 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> c05ee51 (Featire specs) config.asset_host = 'http://localhost:3000' ======= Capybara.configure do |config| >>>>>>> 752f0c0 (Featire specs)
  18. =======
  19. >>>>>>> aa7b40c (Manifest_cache true) 1 ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD config.default_max_wait_time = 5 ======= config.asset_host = 'http://localhost:3000' >>>>>>> 752f0c0 (Featire specs) ======= Capybara.configure do |config| >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= Capybara.configure do |config| >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) Capybara.configure do |config| ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) config.asset_host = 'http://localhost:3000' ======= Capybara.configure do |config| >>>>>>> 752f0c0 (Featire specs)
  20. =======
  21. >>>>>>> aa7b40c (Manifest_cache true) 1 <<<<<<< HEAD config.default_max_wait_time = 5 ======= config.asset_host = 'http://localhost:3000' >>>>>>> 752f0c0 (Featire specs) ======= Capybara.configure do |config| >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 4f4ea3f (Featire specs) ======= >>>>>>> 365d41e (Featire specs) ======= Capybara.configure do |config| >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) Capybara.configure do |config| ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) >>>>>>> a636fda (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) ======= ======= Capybara.configure do |config| >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) Capybara.configure do |config| ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774f (Featire specs)
  22. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) =======
  23. >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> b3f2049 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) >>>>>>> 13fca83 (Rebased) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= >>>>>>> 34509ee (Featire specs) config.asset_host = 'http://localhost:3000' <<<<<<< HEAD ======= ======= >>>>>>> 8480924 (Featire specs) ======= >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41e (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> 13fca83 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 13fca83 (Rebased) config.asset_host = 'http://localhost:3000' <<<<<<< HEAD ======= <<<<<<< HEAD config.asset_host = 'http://localhost:3000' >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= >>>>>>> 4e81ea2 (Featire specs) ======= Capybara.configure do |config| >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c033601 (Rebased) ======= ======= Capybara.configure do |config| >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> a636fda (Featire specs) ======= ======= Capybara.configure do |config| >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> ed32b84 (Featire specs)
  24. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  25. =======
  26. >>>>>>> bd8bda4 (Manifest_cache true) ======= ======= =======
  27. >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) =======
  28. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.default_max_wait_time = 5 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 4e81ea2 (Featire specs) ======= config.asset_host = 'http://localhost:3000' <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= config.default_max_wait_time = 5 ======= config.asset_host = 'http://localhost:3000' >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) >>>>>>> a636fda (Featire specs) ======= ======= Capybara.configure do |config| >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD =======
  29. =======
  30. >>>>>>> aa7b40c (Manifest_cache true) 1 >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= Capybara.configure do |config| >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 563720e (Featire specs)
  31. <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) =======
  32. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> d0dc1f1 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 752f0c0 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 4e81ea2 (Featire specs) ======= Capybara.configure do |config| >>>>>>> 08edf50 (Featire specs)
  33. >>>>>>> 86d584a (Manifest_cache true)
  34. >>>>>>> 009401d (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) config.default_max_wait_time = 5 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.default_driver = :rack_test ======= ======= >>>>>>> 904663c (Featire specs) config.javascript_driver = :headless_chrome >>>>>>> 86d584a (Manifest_cache true) ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 4e81ea2 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= config.default_max_wait_time = 5 ======= config.asset_host = 'http://localhost:3000' >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= <<<<<<< HEAD ======= Capybara.configure do |config| >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs)
  35. =======
  36. >>>>>>> aa7b40c (Manifest_cache true) 1 <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) =======
  37. ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) 1 >>>>>>> 08edf50 (Featire specs) =======
  38. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) config.server_port = 3001 ======= config.default_max_wait_time = 5 >>>>>>> d0dc1f1 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 752f0c0 (Featire specs) ======= Capybara.configure do |config| >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 490b01d (Manifest_cache true)
  39. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> d0dc1f1 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 752f0c0 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 4e81ea2 (Featire specs) ======= Capybara.configure do |config| >>>>>>> 08edf50 (Featire specs)
  40. <<<<<<< HEAD ======= <<<<<<< HEAD =======
  41. >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD config.default_max_wait_time = 5 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome >>>>>>> 490b01d (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome ======= >>>>>>> 490b01d (Manifest_cache true) config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 4e81ea2 (Featire specs) ======= <<<<<<< HEAD config.asset_host = 'http://localhost:3000' >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) =======
  42. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  43. =======
  44. =======
  45. >>>>>>> 02a399d (Manifest_cache true) 1 >>>>>>> d0dc1f1 (Featire specs) =======
  46. =======
  47. >>>>>>> bd8bda4 (Manifest_cache true) 1 >>>>>>> 752f0c0 (Featire specs) =======
  48. =======
  49. >>>>>>> aa7b40c (Manifest_cache true) 1 >>>>>>> 4e81ea2 (Featire specs) =======
  50. =======
  51. <<<<<<< HEAD =======
  52. >>>>>>> 824bb2b (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) config.javascript_driver = :headless_chrome ======= config.default_driver = :rack_test >>>>>>> 752f0c0 (Featire specs) ======= config.server_port = 3001 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 4f4ea3f (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> c033601 (Rebased) ======= config.default_max_wait_time = 5 <<<<<<< HEAD ======= config.server_port = 3001 >>>>>>> c8cdb08 (Manifest_cache true) ======= config.default_driver = :rack_test >>>>>>> 4a0e3b6 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD ======= ======= config.server_port = 3001 >>>>>>> c8cdb08 (Manifest_cache true) ======= config.default_driver = :rack_test >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) >>>>>>> a636fda (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= ======= config.default_max_wait_time = 5 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= ======= ======= >>>>>>> e5890c2 (Manifest_cache true) config.asset_host = 'http://localhost:3000' >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= config.default_max_wait_time = 5 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) >>>>>>> 251144b (Manifest_cache true)
  53. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  54. =======
  55. =======
  56. <<<<<<< HEAD ======= >>>>>>> 02a399d (Manifest_cache true) 1 >>>>>>> d0dc1f1 (Featire specs) =======
  57. =======
  58. >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> bd8bda4 (Manifest_cache true) 1 >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
  59. ======= >>>>>>> 5c33a07 (Featire specs)
  60. =======
  61. >>>>>>> b9cc4e9 (Manifest_cache true) 1 <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) =======
  62. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 490b01d (Manifest_cache true)
  63. 1 <<<<<<< HEAD <<<<<<< HEAD config.server_port = 3001 ======= <<<<<<< HEAD ======= config.default_max_wait_time = 5 ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.default_driver = :rack_test >>>>>>> 8480924 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD end ======= >>>>>>> 8480924 (Featire specs) config.javascript_driver = :headless_chrome ======= config.default_driver = :rack_test >>>>>>> 752f0c0 (Featire specs) ======= config.server_port = 3001 >>>>>>> 4e81ea2 (Featire specs) ======= <<<<<<< HEAD ======= config.server_port = 3001 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= config.server_port = 3001 >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) config.default_driver = :rack_test ======= config.javascript_driver = :headless_chrome >>>>>>> c8cdb08 (Manifest_cache true) ======= config.default_driver = :rack_test >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs)
  64. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD
  65. =======
  66. ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
  67. =======
  68. >>>>>>> b9cc4e9 (Manifest_cache true) 1 <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) =======
  69. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) =======
  70. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= end ======= config.javascript_driver = :headless_chrome >>>>>>> 4e81ea2 (Featire specs) ======= config.default_driver = :rack_test >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= config.default_driver = :rack_test >>>>>>> c033601 (Rebased)
  71. <<<<<<< HEAD <<<<<<< HEAD
  72. =======
  73. =======
  74. >>>>>>> c033601 (Rebased) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) end ======= ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) config.javascript_driver = :headless_chrome ======= config.default_driver = :rack_test >>>>>>> d0dc1f1 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 8480924 (Featire specs) config.default_max_wait_time = 5 <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) ======= config.default_max_wait_time = 5 ======= config.asset_host = 'http://localhost:3000' >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs)
  75. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) >>>>>>> 6e923b9 (Featire specs)
  76. =======
  77. =======
  78. >>>>>>> bd8bda4 (Manifest_cache true) 1 >>>>>>> 752f0c0 (Featire specs) =======
  79. ======= >>>>>>> 5c33a07 (Featire specs)
  80. =======
  81. =======
  82. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) 1 <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= <<<<<<< HEAD
  83. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) =======
  84. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 6e923b9 (Featire specs) ======= =======
  85. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= =======
  86. 1 >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) <<<<<<< HEAD config.default_driver = :rack_test ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= config.javascript_driver = :headless_chrome >>>>>>> 752f0c0 (Featire specs) ======= config.default_driver = :rack_test >>>>>>> 4e81ea2 (Featire specs) ======= config.server_port = 3001 <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome ======= config.default_driver = :rack_test >>>>>>> 752f0c0 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= config.server_port = 3001 >>>>>>> 8480924 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> 8480924 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= ======= >>>>>>> 5c33a07 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> c033601 (Rebased) ======= config.default_max_wait_time = 5 >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs)
  87. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c033601 (Rebased)
  88. >>>>>>> 490b01d (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  89. =======
  90. ======= >>>>>>> 5c33a07 (Featire specs)
  91. 1 <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) =======
  92. <<<<<<< HEAD ======= >>>>>>> c8cdb08 (Manifest_cache true) =======
  93. >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 490b01d (Manifest_cache true) 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= end ======= ======= config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> 08edf50 (Featire specs) ======= ======= >>>>>>> 75fa7e1 (Rebased) config.default_max_wait_time = 5
  94. <<<<<<< HEAD =======
  95. 1 config.server_port = 3001
  96. >>>>>>> 34509ee (Featire specs)
  97. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) config.javascript_driver = :headless_chrome >>>>>>> 4e81ea2 (Featire specs) ======= config.default_driver = :rack_test <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 6e923b9 (Featire specs)
  98. 1 ======= >>>>>>> 34509ee (Featire specs) ======= >>>>>>> 75fa7e1 (Rebased) config.javascript_driver = :headless_chrome >>>>>>> 08edf50 (Featire specs)
  99. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  100. =======
  101. =======
  102. >>>>>>> 490b01d (Manifest_cache true) 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) end ======= config.javascript_driver = :headless_chrome >>>>>>> 08edf50 (Featire specs)
  103. <<<<<<< HEAD
  104. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true)
  105. >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD
  106. =======
  107. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= =======
  108. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= ======= =======
  109. >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= =======
  110. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) ======= <<<<<<< HEAD
  111. =======
  112. =======
  113. <<<<<<< HEAD ======= >>>>>>> 02a399d (Manifest_cache true) 1 >>>>>>> d0dc1f1 (Featire specs) =======
  114. =======
  115. >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> bd8bda4 (Manifest_cache true) 1 >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
  116. ======= >>>>>>> 5c33a07 (Featire specs)
  117. 1 <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) =======
  118. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) =======
  119. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) config.default_driver = :rack_test ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= config.javascript_driver = :headless_chrome >>>>>>> 752f0c0 (Featire specs) ======= config.default_driver = :rack_test >>>>>>> 4e81ea2 (Featire specs) ======= config.server_port = 3001 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= config.server_port = 3001 >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) >>>>>>> a636fda (Featire specs) ======= ======= config.default_max_wait_time = 5 >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs)
  120. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  121. =======
  122. ======= >>>>>>> 5c33a07 (Featire specs)
  123. 1 <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= <<<<<<< HEAD
  124. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) =======
  125. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= end ======= config.javascript_driver = :headless_chrome >>>>>>> 4e81ea2 (Featire specs) ======= config.default_driver = :rack_test >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= config.default_driver = :rack_test >>>>>>> c033601 (Rebased)
  126. <<<<<<< HEAD <<<<<<< HEAD
  127. =======
  128. =======
  129. >>>>>>> c033601 (Rebased) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) end ======= ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) config.javascript_driver = :headless_chrome ======= config.default_driver = :rack_test >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) ======= ======= config.asset_host = 'http://localhost:3000' >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs)
  130. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> a636fda (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs)
  131. =======
  132. 1 >>>>>>> d0dc1f1 (Featire specs) =======
  133. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= =======
  134. =======
  135. =======
  136. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= =======
  137. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) end ======= config.javascript_driver = :headless_chrome >>>>>>> d0dc1f1 (Featire specs) ======= config.default_driver = :rack_test <<<<<<< HEAD ======= ======= config.server_port = 3001 >>>>>>> 4e81ea2 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= config.asset_host = 'http://localhost:3000' >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased)
  138. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c033601 (Rebased)
  139. <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c033601 (Rebased)
  140. ======= ======= >>>>>>> 563720e (Featire specs) =======
  141. 1 <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= config.javascript_driver = :headless_chrome ======= config.default_driver = :rack_test >>>>>>> 752f0c0 (Featire specs) ======= config.server_port = 3001 >>>>>>> 4e81ea2 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 563720e (Featire specs)
  142. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> c033601 (Rebased)
  143. >>>>>>> 86d584a (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs)
  144. >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> d8dd3b4 (Featire specs) =======
  145. =======
  146. <<<<<<< HEAD >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> c8cdb08 (Manifest_cache true) =======
  147. >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) 1 >>>>>>> 752f0c0 (Featire specs) =======
  148. ======= >>>>>>> 5c33a07 (Featire specs)
  149. 1 <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) =======
  150. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 4f4ea3f (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> 4f4ea3f (Featire specs) ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= ======= config.default_driver = :rack_test ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) end ======= ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) config.javascript_driver = :headless_chrome >>>>>>> 752f0c0 (Featire specs) ======= config.default_driver = :rack_test <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= config.server_port = 3001 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= ======= config.server_port = 3001 >>>>>>> 08edf50 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) >>>>>>> 5507b42 (Featire specs) config.default_max_wait_time = 5 ======= config.asset_host = 'http://localhost:3000' >>>>>>> d0dc1f1 (Featire specs) ======= Capybara.configure do |config| >>>>>>> 752f0c0 (Featire specs)
  151. <<<<<<< HEAD <<<<<<< HEAD
  152. =======
  153. >>>>>>> e9f3851 (Manifest_cache true) =======
  154. >>>>>>> d782a28 (Manifest_cache true) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome >>>>>>> 4e81ea2 (Featire specs) ======= config.default_driver = :rack_test <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= config.server_port = 3001 >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= config.server_port = 3001 >>>>>>> 49e8a6c (Rebased) ======= ======= >>>>>>> af057e3 (Featire specs) config.server_port = 3001 ======= config.default_max_wait_time = 5 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= config.asset_host = 'http://localhost:3000' >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs)
  155. <<<<<<< HEAD <<<<<<< HEAD
  156. =======
  157. >>>>>>> e9f3851 (Manifest_cache true) =======
  158. >>>>>>> d782a28 (Manifest_cache true) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome >>>>>>> 08edf50 (Featire specs)
  159. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs)
  160. =======
  161. <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true)
  162. 1 <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) =======
  163. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD end ======= config.javascript_driver = :headless_chrome >>>>>>> d0dc1f1 (Featire specs)
  164. >>>>>>> c033601 (Rebased)
  165. >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD config.javascript_driver = :headless_chrome ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= end ======= config.javascript_driver = :headless_chrome >>>>>>> 4e81ea2 (Featire specs) ======= config.default_driver = :rack_test >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs)
  166. <<<<<<< HEAD <<<<<<< HEAD
  167. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true)
  168. >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD
  169. =======
  170. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= =======
  171. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= ======= =======
  172. >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) =======
  173. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) end ======= config.javascript_driver = :headless_chrome >>>>>>> 08edf50 (Featire specs)
  174. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774f (Featire specs)
  175. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a636fda (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> 9440753 (Featire specs) >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774f (Featire specs)
  176. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  177. =======
  178. >>>>>>> 752f0c0 (Featire specs) =======
  179. >>>>>>> bd8bda4 (Manifest_cache true) =======
  180. >>>>>>> 4e81ea2 (Featire specs) =======
  181. >>>>>>> aa7b40c (Manifest_cache true) =======
  182. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) 1 <<<<<<< HEAD ======= =======
  183. <<<<<<< HEAD =======
  184. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) =======
  185. <<<<<<< HEAD =======
  186. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> d8dd3b4 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> c05ee51 (Featire specs) Capybara.register_driver :headless_chrome do |app| <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= end ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) config.default_driver = :rack_test ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= end >>>>>>> 009401d (Featire specs) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 311e9fa (Rebased) config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= config.default_max_wait_time = 5 >>>>>>> 752f0c0 (Featire specs) >>>>>>> 77d62af (Featire specs)
  187. <<<<<<< HEAD <<<<<<< HEAD
  188. =======
  189. >>>>>>> e9f3851 (Manifest_cache true) =======
  190. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome >>>>>>> 08edf50 (Featire specs)
  191. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true)
  192. >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD
  193. =======
  194. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= =======
  195. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) ======= =======
  196. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= =======
  197. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= end
  198. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= end >>>>>>> d0dc1f1 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs)
  199. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs)
  200. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  201. =======
  202. >>>>>>> 752f0c0 (Featire specs) =======
  203. >>>>>>> bd8bda4 (Manifest_cache true) =======
  204. >>>>>>> 4e81ea2 (Featire specs) =======
  205. >>>>>>> aa7b40c (Manifest_cache true) =======
  206. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) =======
  207. >>>>>>> c033601 (Rebased) 1 =======
  208. =======
  209. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) =======
  210. =======
  211. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD Capybara.register_driver :headless_chrome do |app| ======= >>>>>>> d0dc1f1 (Featire specs) ======= end ======= ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) config.default_driver = :rack_test ======= config.javascript_driver = :headless_chrome >>>>>>> 96aecde (Manifest_cache true) ======= config.default_driver = :rack_test >>>>>>> d0dc1f1 (Featire specs) ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs)
  212. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  213. =======
  214. =======
  215. >>>>>>> 02a399d (Manifest_cache true) 1 >>>>>>> d0dc1f1 (Featire specs) =======
  216. =======
  217. <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) 1 <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7a02bbe (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 311e9fa (Rebased) ======= ======= config.default_driver = :rack_test >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) >>>>>>> 77d62af (Featire specs)
  218. <<<<<<< HEAD
  219. ======= <<<<<<< HEAD
  220. >>>>>>> 8480924 (Featire specs) 1 config.javascript_driver = :headless_chrome <<<<<<< HEAD >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509ee (Featire specs) ======= >>>>>>> 75fa7e1 (Rebased)
  221. <<<<<<< HEAD
  222. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> d8dd3b4 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
  223. ======= <<<<<<< HEAD
  224. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 8480924 (Featire specs) ======= >>>>>>> 251144b (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  225. =======
  226. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) ======= =======
  227. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 34509ee (Featire specs)
  228. >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) ======= =======
  229. >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> bf554f4 (Rebased)
  230. >>>>>>> 75fa7e1 (Rebased) end
  231. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased)
  232. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= =======
  233. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) =======
  234. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= ======= =======
  235. >>>>>>> 009401d (Featire specs) >>>>>>> d8dd3b4 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD ======= end
  236. ======= >>>>>>> b832d45 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> e5752db (Featire specs)
  237. >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= ======= =======
  238. >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs)
  239. >>>>>>> 49e8a6c (Rebased) =======
  240. =======
  241. >>>>>>> 02a399d (Manifest_cache true) 1 >>>>>>> d0dc1f1 (Featire specs) =======
  242. ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD end ======= config.javascript_driver = :headless_chrome >>>>>>> d0dc1f1 (Featire specs) ======= config.default_driver = :rack_test
  243. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true)
  244. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= =======
  245. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) =======
  246. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= ======= =======
  247. =======
  248. >>>>>>> 96aecde (Manifest_cache true) 1 config.javascript_driver = :headless_chrome >>>>>>> 752f0c0 (Featire specs)
  249. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true)
  250. >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 311e9fa (Rebased) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) ======= end >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= <<<<<<< HEAD ======= end >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) >>>>>>> 932dbec (Featire specs)
  251. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 34509ee (Featire specs) <<<<<<< HEAD ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true)
  252. <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= ======= =======
  253. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= =======
  254. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) =======
  255. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true)
  256. <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs)
  257. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  258. =======
  259. >>>>>>> 752f0c0 (Featire specs) =======
  260. >>>>>>> bd8bda4 (Manifest_cache true) =======
  261. >>>>>>> 4e81ea2 (Featire specs) =======
  262. >>>>>>> aa7b40c (Manifest_cache true) =======
  263. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= ======= =======
  264. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= =======
  265. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) =======
  266. >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) >>>>>>> 13fca83 (Rebased) 1 ======= <<<<<<< HEAD
  267. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
  268. 1 >>>>>>> 752f0c0 (Featire specs) =======
  269. >>>>>>> bd8bda4 (Manifest_cache true) =======
  270. 1 >>>>>>> 4e81ea2 (Featire specs) =======
  271. >>>>>>> aa7b40c (Manifest_cache true) =======
  272. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= =======
  273. >>>>>>> 8480924 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 7a02bbe (Featire specs) ======= <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) =======
  274. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= =======
  275. =======
  276. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> 9620751 (Featire specs) ======= =======
  277. =======
  278. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 75fa7e1 (Rebased) Capybara.register_driver :headless_chrome do |app|
  279. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price)
  280. 1 ======= <<<<<<< HEAD
  281. >>>>>>> ae2a012 (Manifest_cache true) =======
  282. 1 >>>>>>> 752f0c0 (Featire specs) =======
  283. 1 >>>>>>> 4e81ea2 (Featire specs) =======
  284. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= =======
  285. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  286. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= =======
  287. >>>>>>> fd6db03 (Manifest_cache true) =======
  288. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) =======
  289. >>>>>>> 75fa7e1 (Rebased) =======
  290. 1 >>>>>>> 67ab529 (Fix) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 490b01d (Manifest_cache true) client = Selenium::WebDriver::Remote::Http::Default.new <<<<<<< HEAD ======= ======= Capybara.register_driver :headless_chrome do |app| >>>>>>> d0dc1f1 (Featire specs) ======= Capybara.register_driver :headless_chrome do |app| >>>>>>> 752f0c0 (Featire specs) ======= Capybara.register_driver :headless_chrome do |app| >>>>>>> 4e81ea2 (Featire specs) ======= Capybara.register_driver :headless_chrome do |app| >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509ee (Featire specs) ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> 75fa7e1 (Rebased) ======= client = Selenium::WebDriver::Remote::Http::Default.new ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) Capybara.register_driver :headless_chrome do |app| ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= end ======= >>>>>>> 5507b42 (Featire specs) ======= ======= end >>>>>>> af057e3 (Featire specs)
  291. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  292. =======
  293. >>>>>>> d782a28 (Manifest_cache true) >>>>>>> 752f0c0 (Featire specs)
  294. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bd8bda4 (Manifest_cache true)
  295. 1 >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
  296. ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
  297. <<<<<<< HEAD ======= ======= =======
  298. =======
  299. =======
  300. >>>>>>> e9f3851 (Manifest_cache true) 1 >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD ======= Capybara.register_driver :headless_chrome do |app| >>>>>>> 307f31f (Manifest_cache true)
  301. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs)
  302. >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> 563720e (Featire specs) =======
  303. >>>>>>> 307f31f (Manifest_cache true) 1 =======
  304. >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> d782a28 (Manifest_cache true)
  305. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD =======
  306. 1 <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 4e81ea2 (Featire specs) =======
  307. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= <<<<<<< HEAD ======= =======
  308. 1 >>>>>>> 752f0c0 (Featire specs) =======
  309. >>>>>>> bd8bda4 (Manifest_cache true) =======
  310. 1 >>>>>>> 4e81ea2 (Featire specs) =======
  311. >>>>>>> aa7b40c (Manifest_cache true) =======
  312. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) =======
  313. 1 <<<<<<< HEAD =======
  314. >>>>>>> ae2a012 (Manifest_cache true) =======
  315. 1 >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  316. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD =======
  317. >>>>>>> fd6db03 (Manifest_cache true) =======
  318. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) =======
  319. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) client = Selenium::WebDriver::Remote::Http::Default.new ======= Capybara.register_driver :headless_chrome do |app| >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= Capybara.register_driver :headless_chrome do |app| >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= Capybara.register_driver :headless_chrome do |app| >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= Capybara.register_driver :headless_chrome do |app| <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= Capybara.register_driver :headless_chrome do |app| >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= Capybara.register_driver :headless_chrome do |app| >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs)
  320. <<<<<<< HEAD <<<<<<< HEAD
  321. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 4f4ea3f (Featire specs) ======= >>>>>>> c05ee51 (Featire specs) <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> d8dd3b4 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= >>>>>>> b28889f (Fix) >>>>>>> 5a2009f (Fix) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5a2009f (Fix) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> 4f4ea3f (Featire specs)
  322. =======
  323. >>>>>>> 59d75f9 (Featire specs) ======= <<<<<<< HEAD
  324. 1 =======
  325. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= =======
  326. 1 >>>>>>> 752f0c0 (Featire specs) =======
  327. >>>>>>> bd8bda4 (Manifest_cache true) =======
  328. 1 >>>>>>> 4e81ea2 (Featire specs) =======
  329. >>>>>>> aa7b40c (Manifest_cache true) =======
  330. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= =======
  331. >>>>>>> 183b6c5 (Manifest_cache true) =======
  332. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) =======
  333. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 009401d (Featire specs) ======= =======
  334. >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 78717cc (Manifest_cache true) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  335. =======
  336. >>>>>>> 1c3ace6 (Manifest_cache true) ======= <<<<<<< HEAD
  337. 1 =======
  338. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 98beee2 (Manifest_cache true) ======= ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) =======
  339. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= =======
  340. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= ======= =======
  341. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= =======
  342. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= ======= ======= =======
  343. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= ======= =======
  344. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= =======
  345. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= =======
  346. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= ======= =======
  347. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= =======
  348. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= =======
  349. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= ======= =======
  350. 1 >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) =======
  351. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= =======
  352. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= =======
  353. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= =======
  354. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= =======
  355. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
  356. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
  357. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= =======
  358. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= =======
  359. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) =======
  360. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) =======
  361. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= =======
  362. >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6d (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2179316 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0e (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> d245196 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41e (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> 13fca83 (Rebased) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 1ca9c0e (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 1ca9c0e (Featire specs) client.read_timeout = 150 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= client.read_timeout = 150 ======= <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) client.read_timeout = 150 ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> 752f0c0 (Featire specs) ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> 4e81ea2 (Featire specs) ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= client.read_timeout = 150 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509ee (Featire specs) ======= client.read_timeout = 150 >>>>>>> 75fa7e1 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 365d41e (Featire specs) ======= >>>>>>> c05ee51 (Featire specs) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 1ca9c0e (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= client = Selenium::WebDriver::Remote::Http::Default.new <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= client.read_timeout = 150 >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= client.read_timeout = 150 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs)
  363. <<<<<<< HEAD <<<<<<< HEAD
  364. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 4f4ea3f (Featire specs) ======= >>>>>>> c05ee51 (Featire specs) <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> d8dd3b4 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= >>>>>>> b28889f (Fix) >>>>>>> 5a2009f (Fix) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5a2009f (Fix) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> 4f4ea3f (Featire specs)
  365. ======= ======= >>>>>>> 96aecde (Manifest_cache true)
  366. >>>>>>> 59d75f9 (Featire specs) ======= <<<<<<< HEAD
  367. 1 =======
  368. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= =======
  369. 1 >>>>>>> 752f0c0 (Featire specs) =======
  370. >>>>>>> bd8bda4 (Manifest_cache true) =======
  371. 1 >>>>>>> 4e81ea2 (Featire specs) =======
  372. >>>>>>> aa7b40c (Manifest_cache true) =======
  373. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= =======
  374. >>>>>>> 183b6c5 (Manifest_cache true) =======
  375. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) =======
  376. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 009401d (Featire specs) ======= =======
  377. >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 78717cc (Manifest_cache true) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= ======= >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  378. =======
  379. >>>>>>> 1c3ace6 (Manifest_cache true) ======= <<<<<<< HEAD
  380. 1 =======
  381. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 98beee2 (Manifest_cache true) ======= ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) =======
  382. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= =======
  383. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= ======= =======
  384. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= =======
  385. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= ======= ======= =======
  386. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= ======= =======
  387. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= =======
  388. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= =======
  389. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= =======
  390. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= ======= =======
  391. 1 >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) =======
  392. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= =======
  393. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= =======
  394. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= =======
  395. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= =======
  396. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
  397. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
  398. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) =======
  399. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) =======
  400. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= =======
  401. >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6d (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2179316 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0e (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> d245196 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) options = ::Selenium::WebDriver::Chrome::Options.new ======= client.read_timeout = 150 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= client.read_timeout = 150 >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD client.read_timeout = 150 >>>>>>> 4e81ea2 (Featire specs) ======= client.read_timeout = 150 >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= client.read_timeout = 150 >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= client.read_timeout = 150 <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= client.read_timeout = 150 >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs)
  402. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> df37394 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 93bdda9 (Featire specs)
  403. ======= <<<<<<< HEAD
  404. 1 =======
  405. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
  406. 1 >>>>>>> 752f0c0 (Featire specs) =======
  407. >>>>>>> bd8bda4 (Manifest_cache true) =======
  408. 1 >>>>>>> 4e81ea2 (Featire specs) =======
  409. >>>>>>> aa7b40c (Manifest_cache true) =======
  410. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= =======
  411. >>>>>>> 183b6c5 (Manifest_cache true) =======
  412. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
  413. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true)
  414. <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= =======
  415. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= =======
  416. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
  417. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= =======
  418. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) options = ::Selenium::WebDriver::Chrome::Options.new
  419. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= >>>>>>> 6e923b9 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= <<<<<<< HEAD >>>>>>> 8480924 (Featire specs)
  420. 1 ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 98beee2 (Manifest_cache true) ======= >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= ======= >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> 84d0df6 (Manifest_cache true) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> 450f4e3 (Manifest_cache true) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price)
  421. ======= <<<<<<< HEAD
  422. 1 =======
  423. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
  424. 1 >>>>>>> 752f0c0 (Featire specs) =======
  425. >>>>>>> bd8bda4 (Manifest_cache true) =======
  426. 1 >>>>>>> 4e81ea2 (Featire specs) =======
  427. >>>>>>> aa7b40c (Manifest_cache true) =======
  428. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= =======
  429. >>>>>>> 183b6c5 (Manifest_cache true) =======
  430. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= =======
  431. 1 >>>>>>> c033601 (Rebased) >>>>>>> 9a49b7b (Rebased) =======
  432. 1 >>>>>>> 70fcacc (Featire specs) =======
  433. >>>>>>> 78717cc (Manifest_cache true) ======= >>>>>>> 98beee2 (Manifest_cache true) ======= =======
  434. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= =======
  435. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= =======
  436. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= =======
  437. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= =======
  438. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= =======
  439. >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= =======
  440. 1 >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= =======
  441. 1 >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true)
  442. <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= =======
  443. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= =======
  444. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
  445. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> d8abfed (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) options = ::Selenium::WebDriver::Chrome::Options.new
  446. <<<<<<< HEAD
  447. =======
  448. 1 >>>>>>> 4e81ea2 (Featire specs) =======
  449. >>>>>>> aa7b40c (Manifest_cache true) =======
  450. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= =======
  451. >>>>>>> 183b6c5 (Manifest_cache true) =======
  452. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509ee (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509ee (Featire specs) ======= >>>>>>> 75fa7e1 (Rebased) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> 77d62af (Featire specs) options = ::Selenium::WebDriver::Chrome::Options.new ======= client.read_timeout = 150 >>>>>>> d0dc1f1 (Featire specs) ======= client.read_timeout = 150 >>>>>>> 752f0c0 (Featire specs)
  453. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  454. ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD
  455. 1 <<<<<<< HEAD ======= =======
  456. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) =======
  457. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true)
  458. >>>>>>> bd8bda4 (Manifest_cache true) =======
  459. 1 >>>>>>> 4e81ea2 (Featire specs) =======
  460. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  461. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) =======
  462. >>>>>>> 49e8a6c (Rebased) =======
  463. 1 >>>>>>> 872e675 (Fix) =======
  464. >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) =======
  465. 1 >>>>>>> b28889f (Fix) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) ======= options = ::Selenium::WebDriver::Chrome::Options.new
  466. <<<<<<< HEAD <<<<<<< HEAD
  467. 1 <<<<<<< HEAD <<<<<<< HEAD =======
  468. 1 <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) =======
  469. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= =======
  470. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= =======
  471. >>>>>>> 183b6c5 (Manifest_cache true) =======
  472. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) =======
  473. >>>>>>> e9f3851 (Manifest_cache true) =======
  474. ======= <<<<<<< HEAD
  475. 1 =======
  476. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= =======
  477. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= =======
  478. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= options = ::Selenium::WebDriver::Chrome::Options.new
  479. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs) options.headless!
  480. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> d8abfed (Featire specs)
  481. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  482. =======
  483. >>>>>>> 752f0c0 (Featire specs) =======
  484. >>>>>>> bd8bda4 (Manifest_cache true) =======
  485. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= ======= >>>>>>> 251144b (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) =======
  486. >>>>>>> aa7b40c (Manifest_cache true) =======
  487. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774f (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 4f4ea3f (Featire specs) =======
  488. >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true)
  489. =======
  490. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= =======
  491. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= =======
  492. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= =======
  493. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= =======
  494. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= =======
  495. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
  496. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= =======
  497. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) =======
  498. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= =======
  499. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= =======
  500. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
  501. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= =======
  502. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) =======
  503. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= =======
  504. =======
  505. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= =======
  506. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6d (Manifest_cache true) ======= ======= ======= ======= =======
  507. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0e (Featire specs) ======= ======= ======= ======= =======
  508. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> d245196 (Manifest_cache true)
  509. <<<<<<< HEAD <<<<<<< HEAD
  510. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 4f4ea3f (Featire specs) ======= >>>>>>> 365d41e (Featire specs) ======= >>>>>>> c05ee51 (Featire specs) <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> d8dd3b4 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= >>>>>>> b28889f (Fix) >>>>>>> 5a2009f (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5a2009f (Fix) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> 4f4ea3f (Featire specs)
  511. ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e5890c2 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6d (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) >>>>>>> 2179316 (Manifest_cache true)
  512. 1 =======
  513. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6d (Manifest_cache true) ======= ======= ======= >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) >>>>>>> 2179316 (Manifest_cache true) >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
  514. 1 >>>>>>> 752f0c0 (Featire specs) =======
  515. >>>>>>> bd8bda4 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true)
  516. 1 >>>>>>> 4e81ea2 (Featire specs) =======
  517. >>>>>>> aa7b40c (Manifest_cache true) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs)
  518. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= =======
  519. >>>>>>> 183b6c5 (Manifest_cache true) =======
  520. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= >>>>>>> 8480924 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> d8abfed (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 824bb2b (Featire specs) =======
  521. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 78717cc (Manifest_cache true) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 98beee2 (Manifest_cache true) ======= ======= >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 96aecde (Manifest_cache true) =======
  522. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= ======= >>>>>>> c8da2e3 (Fix) =======
  523. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= >>>>>>> 251144b (Manifest_cache true) >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> e5890c2 (Manifest_cache true) =======
  524. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> c8da2e3 (Fix) ======= =======
  525. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f (Fix) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= =======
  526. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= >>>>>>> c8da2e3 (Fix) ======= =======
  527. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) =======
  528. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) =======
  529. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6d (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2179316 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> d245196 (Manifest_cache true) options.add_argument('--no-sandbox')
  530. <<<<<<< HEAD <<<<<<< HEAD
  531. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 4f4ea3f (Featire specs) ======= >>>>>>> 365d41e (Featire specs) ======= >>>>>>> 251144b (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> 5a2009f (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> 4f4ea3f (Featire specs)
  532. ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> e5890c2 (Manifest_cache true) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> d8abfed (Featire specs) >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> d245196 (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= ======= >>>>>>> 251144b (Manifest_cache true) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= ======= >>>>>>> 86d584a (Manifest_cache true) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) >>>>>>> 2179316 (Manifest_cache true)
  533. 1 =======
  534. >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> bf137e4 (Manifest_cache true) ======= >>>>>>> 77d62af (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2179316 (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
  535. 1 >>>>>>> 752f0c0 (Featire specs) =======
  536. >>>>>>> bd8bda4 (Manifest_cache true) =======
  537. 1 >>>>>>> 4e81ea2 (Featire specs) =======
  538. >>>>>>> aa7b40c (Manifest_cache true) =======
  539. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= =======
  540. >>>>>>> 183b6c5 (Manifest_cache true) =======
  541. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 824bb2b (Featire specs) =======
  542. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 98beee2 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) =======
  543. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= =======
  544. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= =======
  545. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= ======= =======
  546. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= =======
  547. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= ======= =======
  548. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= =======
  549. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= =======
  550. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= ======= =======
  551. 1 >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= ======= =======
  552. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= =======
  553. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= =======
  554. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
  555. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= =======
  556. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= =======
  557. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) =======
  558. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) =======
  559. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2179316 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41e (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> 13fca83 (Rebased) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 1ca9c0e (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 1ca9c0e (Featire specs) options.add_argument('--disable-dev-shm-usage') ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= options.add_argument('--disable-dev-shm-usage') ======= <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) options.add_argument('--disable-dev-shm-usage') ======= options.add_argument('--no-sandbox') >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= options.add_argument('--no-sandbox') >>>>>>> 752f0c0 (Featire specs) ======= options.add_argument('--no-sandbox') >>>>>>> 4e81ea2 (Featire specs) ======= options.add_argument('--no-sandbox') >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509ee (Featire specs) ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 75fa7e1 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 365d41e (Featire specs) ======= >>>>>>> c05ee51 (Featire specs) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 1ca9c0e (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= options.add_argument('--no-sandbox') >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= options.add_argument('--no-sandbox') >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= options.add_argument('--no-sandbox') <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= options.add_argument('--no-sandbox') >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= options.add_argument('--no-sandbox') >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs)
  560. <<<<<<< HEAD <<<<<<< HEAD
  561. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 4f4ea3f (Featire specs) ======= >>>>>>> c05ee51 (Featire specs) ======= >>>>>>> fc3774f (Featire specs) <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> d8dd3b4 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= >>>>>>> b28889f (Fix) >>>>>>> 5a2009f (Fix) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5a2009f (Fix) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> 4f4ea3f (Featire specs)
  562. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 8480924 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2179316 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs)
  563. 1 ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  564. 1 ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6d (Manifest_cache true) ======= ======= ======= >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) >>>>>>> 2179316 (Manifest_cache true)
  565. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
  566. 1 >>>>>>> 752f0c0 (Featire specs) =======
  567. >>>>>>> bd8bda4 (Manifest_cache true) =======
  568. 1 >>>>>>> 4e81ea2 (Featire specs) =======
  569. >>>>>>> aa7b40c (Manifest_cache true) =======
  570. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= =======
  571. >>>>>>> 183b6c5 (Manifest_cache true) =======
  572. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) =======
  573. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 009401d (Featire specs) ======= =======
  574. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 78717cc (Manifest_cache true) ======= ======= >>>>>>> 009401d (Featire specs) =======
  575. >>>>>>> 02a399d (Manifest_cache true) =======
  576. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) =======
  577. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 98beee2 (Manifest_cache true) ======= ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) =======
  578. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= =======
  579. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= ======= =======
  580. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= =======
  581. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= ======= ======= =======
  582. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= ======= =======
  583. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= =======
  584. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= =======
  585. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= ======= =======
  586. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= =======
  587. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= =======
  588. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= ======= =======
  589. 1 >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) =======
  590. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= =======
  591. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= =======
  592. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= =======
  593. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= =======
  594. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
  595. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
  596. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= =======
  597. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= =======
  598. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) =======
  599. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) =======
  600. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= =======
  601. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6d (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2179316 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0e (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> d245196 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41e (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> 13fca83 (Rebased) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 1ca9c0e (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 1ca9c0e (Featire specs) options.add_argument('--window-size=1400,1400') ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= options.add_argument('--window-size=1400,1400') ======= <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) options.add_argument('--window-size=1400,1400') ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 752f0c0 (Featire specs) ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 4e81ea2 (Featire specs) ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= options.add_argument('--window-size=1400,1400') >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509ee (Featire specs) ======= options.add_argument('--window-size=1400,1400') >>>>>>> 75fa7e1 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 365d41e (Featire specs) ======= >>>>>>> c05ee51 (Featire specs) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 1ca9c0e (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= options.add_argument('--disable-dev-shm-usage') <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= options.add_argument('--window-size=1400,1400') >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= options.add_argument('--window-size=1400,1400') >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs)
  602. <<<<<<< HEAD <<<<<<< HEAD
  603. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 4f4ea3f (Featire specs) ======= >>>>>>> c05ee51 (Featire specs) <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> d8dd3b4 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= >>>>>>> b28889f (Fix) >>>>>>> 5a2009f (Fix) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5a2009f (Fix) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> 4f4ea3f (Featire specs)
  604. ======= ======= >>>>>>> 96aecde (Manifest_cache true)
  605. >>>>>>> 59d75f9 (Featire specs) ======= <<<<<<< HEAD
  606. 1 =======
  607. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= =======
  608. 1 >>>>>>> 752f0c0 (Featire specs) =======
  609. >>>>>>> bd8bda4 (Manifest_cache true) =======
  610. 1 >>>>>>> 4e81ea2 (Featire specs) =======
  611. >>>>>>> aa7b40c (Manifest_cache true) =======
  612. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= =======
  613. >>>>>>> 183b6c5 (Manifest_cache true) =======
  614. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) =======
  615. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 009401d (Featire specs) ======= =======
  616. >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 78717cc (Manifest_cache true) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= ======= >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  617. =======
  618. >>>>>>> 1c3ace6 (Manifest_cache true) ======= <<<<<<< HEAD
  619. 1 =======
  620. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 98beee2 (Manifest_cache true) ======= ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) =======
  621. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= =======
  622. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= ======= =======
  623. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= =======
  624. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= ======= ======= =======
  625. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= ======= =======
  626. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= =======
  627. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= =======
  628. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= ======= =======
  629. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= =======
  630. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= =======
  631. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= ======= =======
  632. 1 >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) =======
  633. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= =======
  634. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= =======
  635. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= =======
  636. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= =======
  637. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
  638. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
  639. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= =======
  640. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= =======
  641. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) =======
  642. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) =======
  643. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= =======
  644. >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6d (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2179316 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0e (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> d245196 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41e (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> 13fca83 (Rebased) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 1ca9c0e (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 1ca9c0e (Featire specs) options.add_argument('--allow-insecure-localhost') ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= options.add_argument('--allow-insecure-localhost') ======= <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) options.add_argument('--allow-insecure-localhost') ======= options.add_argument('--window-size=1400,1400') >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= options.add_argument('--window-size=1400,1400') >>>>>>> 752f0c0 (Featire specs) ======= options.add_argument('--window-size=1400,1400') >>>>>>> 4e81ea2 (Featire specs) ======= options.add_argument('--window-size=1400,1400') >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509ee (Featire specs) ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 75fa7e1 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 365d41e (Featire specs) ======= >>>>>>> c05ee51 (Featire specs) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 1ca9c0e (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= options.add_argument('--window-size=1400,1400') >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= options.add_argument('--window-size=1400,1400') >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= options.add_argument('--window-size=1400,1400') <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= options.add_argument('--window-size=1400,1400') >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= options.add_argument('--window-size=1400,1400') >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs)
  645. <<<<<<< HEAD <<<<<<< HEAD
  646. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 4f4ea3f (Featire specs) ======= >>>>>>> c05ee51 (Featire specs) <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> d8dd3b4 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= >>>>>>> b28889f (Fix) >>>>>>> 5a2009f (Fix) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5a2009f (Fix) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> 4f4ea3f (Featire specs)
  647. ======= ======= >>>>>>> 96aecde (Manifest_cache true)
  648. >>>>>>> 59d75f9 (Featire specs) ======= <<<<<<< HEAD
  649. 1 =======
  650. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= =======
  651. 1 >>>>>>> 752f0c0 (Featire specs) =======
  652. >>>>>>> bd8bda4 (Manifest_cache true) =======
  653. 1 >>>>>>> 4e81ea2 (Featire specs) =======
  654. >>>>>>> aa7b40c (Manifest_cache true) =======
  655. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= =======
  656. >>>>>>> 183b6c5 (Manifest_cache true) =======
  657. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) =======
  658. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 009401d (Featire specs) ======= =======
  659. >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 78717cc (Manifest_cache true) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= ======= >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  660. =======
  661. >>>>>>> 1c3ace6 (Manifest_cache true) ======= <<<<<<< HEAD
  662. 1 =======
  663. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 98beee2 (Manifest_cache true) ======= ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) =======
  664. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= =======
  665. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= ======= =======
  666. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= =======
  667. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= ======= ======= =======
  668. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= ======= =======
  669. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= =======
  670. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= =======
  671. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= ======= =======
  672. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= =======
  673. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= =======
  674. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= ======= =======
  675. 1 >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) =======
  676. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= =======
  677. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= =======
  678. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= =======
  679. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= =======
  680. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
  681. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
  682. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= =======
  683. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= =======
  684. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) =======
  685. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) =======
  686. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= =======
  687. >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6d (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2179316 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0e (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> d245196 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41e (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> 13fca83 (Rebased) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 1ca9c0e (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 1ca9c0e (Featire specs) options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') ======= <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') ======= options.add_argument('--allow-insecure-localhost') >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 752f0c0 (Featire specs) ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 4e81ea2 (Featire specs) ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509ee (Featire specs) ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 75fa7e1 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 365d41e (Featire specs) ======= >>>>>>> c05ee51 (Featire specs) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 1ca9c0e (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= options.add_argument('--allow-insecure-localhost') <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs)
  688. <<<<<<< HEAD <<<<<<< HEAD
  689. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 4f4ea3f (Featire specs) ======= >>>>>>> c05ee51 (Featire specs) <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> d8dd3b4 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= >>>>>>> b28889f (Fix) >>>>>>> 5a2009f (Fix) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5a2009f (Fix) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> 4f4ea3f (Featire specs)
  690. ======= ======= >>>>>>> 96aecde (Manifest_cache true)
  691. >>>>>>> 59d75f9 (Featire specs) ======= <<<<<<< HEAD
  692. 1 =======
  693. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= =======
  694. 1 >>>>>>> 752f0c0 (Featire specs) =======
  695. >>>>>>> bd8bda4 (Manifest_cache true) =======
  696. 1 >>>>>>> 4e81ea2 (Featire specs) =======
  697. >>>>>>> aa7b40c (Manifest_cache true) =======
  698. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= =======
  699. >>>>>>> 183b6c5 (Manifest_cache true) =======
  700. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) =======
  701. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 009401d (Featire specs) ======= =======
  702. >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 78717cc (Manifest_cache true) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= ======= >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
  703. =======
  704. >>>>>>> 1c3ace6 (Manifest_cache true) ======= <<<<<<< HEAD
  705. 1 =======
  706. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 98beee2 (Manifest_cache true) ======= ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) =======
  707. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= =======
  708. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= ======= =======
  709. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= =======
  710. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= ======= ======= =======
  711. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= ======= =======
  712. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= =======
  713. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= =======
  714. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= =======
  715. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= ======= =======
  716. 1 >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) =======
  717. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= =======
  718. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= =======
  719. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= =======
  720. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= =======
  721. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
  722. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
  723. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) =======
  724. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) =======
  725. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= =======
  726. >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6d (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2179316 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0e (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> d245196 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) options.add_argument('--ignore-certificate-errors=true') ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 4e81ea2 (Featire specs) ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs)
  727. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> df37394 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 93bdda9 (Featire specs)
  728. ======= <<<<<<< HEAD
  729. 1 =======
  730. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
  731. 1 >>>>>>> 752f0c0 (Featire specs) =======
  732. >>>>>>> bd8bda4 (Manifest_cache true) =======
  733. 1 >>>>>>> 4e81ea2 (Featire specs) =======
  734. >>>>>>> aa7b40c (Manifest_cache true) =======
  735. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= =======
  736. >>>>>>> 183b6c5 (Manifest_cache true) =======
  737. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
  738. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true)
  739. <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= =======
  740. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= =======
  741. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
  742. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= =======
  743. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) options.add_argument('--ignore-certificate-errors=true')
  744. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= >>>>>>> 6e923b9 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= <<<<<<< HEAD >>>>>>> 8480924 (Featire specs)
  745. 1 ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 98beee2 (Manifest_cache true) ======= >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= ======= >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> 84d0df6 (Manifest_cache true) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> 450f4e3 (Manifest_cache true) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price)
  746. ======= <<<<<<< HEAD
  747. 1 =======
  748. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
  749. 1 >>>>>>> 752f0c0 (Featire specs) =======
  750. >>>>>>> bd8bda4 (Manifest_cache true) =======
  751. 1 >>>>>>> 4e81ea2 (Featire specs) =======
  752. >>>>>>> aa7b40c (Manifest_cache true) =======
  753. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= =======
  754. >>>>>>> 183b6c5 (Manifest_cache true) =======
  755. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= =======
  756. 1 >>>>>>> c033601 (Rebased) >>>>>>> 9a49b7b (Rebased) =======
  757. 1 >>>>>>> 70fcacc (Featire specs) =======
  758. >>>>>>> 78717cc (Manifest_cache true) ======= >>>>>>> 98beee2 (Manifest_cache true) ======= =======
  759. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= =======
  760. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= =======
  761. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= =======
  762. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= =======
  763. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= =======
  764. >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= =======
  765. 1 >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= =======
  766. 1 >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true)
  767. <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= =======
  768. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= =======
  769. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
  770. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> d8abfed (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) options.add_argument('--ignore-certificate-errors=true')
  771. <<<<<<< HEAD
  772. =======
  773. 1 >>>>>>> 4e81ea2 (Featire specs) =======
  774. >>>>>>> aa7b40c (Manifest_cache true) =======
  775. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= =======
  776. >>>>>>> 183b6c5 (Manifest_cache true) =======
  777. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509ee (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509ee (Featire specs) ======= >>>>>>> 75fa7e1 (Rebased) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> 77d62af (Featire specs) options.add_argument('--ignore-certificate-errors=true') ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> d0dc1f1 (Featire specs) ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 752f0c0 (Featire specs)
  778. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  779. ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD
  780. 1 <<<<<<< HEAD ======= =======
  781. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) =======
  782. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true)
  783. >>>>>>> bd8bda4 (Manifest_cache true) =======
  784. 1 >>>>>>> 4e81ea2 (Featire specs) =======
  785. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  786. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) =======
  787. >>>>>>> 49e8a6c (Rebased) =======
  788. 1 >>>>>>> 872e675 (Fix) =======
  789. >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) =======
  790. 1 >>>>>>> b28889f (Fix) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) ======= options.add_argument('--ignore-certificate-errors=true')
  791. <<<<<<< HEAD <<<<<<< HEAD
  792. 1 <<<<<<< HEAD <<<<<<< HEAD =======
  793. 1 <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) =======
  794. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= =======
  795. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= =======
  796. >>>>>>> 183b6c5 (Manifest_cache true) =======
  797. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) =======
  798. >>>>>>> e9f3851 (Manifest_cache true) =======
  799. ======= <<<<<<< HEAD
  800. 1 =======
  801. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= =======
  802. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= =======
  803. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= options.add_argument('--ignore-certificate-errors=true')
  804. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs) options.add_argument('--accept-insecure-certs=true')
  805. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> d8abfed (Featire specs)
  806. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  807. =======
  808. >>>>>>> 752f0c0 (Featire specs) =======
  809. >>>>>>> bd8bda4 (Manifest_cache true) =======
  810. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= ======= >>>>>>> 251144b (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) =======
  811. >>>>>>> aa7b40c (Manifest_cache true) =======
  812. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774f (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 4f4ea3f (Featire specs) =======
  813. >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true)
  814. =======
  815. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= =======
  816. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= =======
  817. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= =======
  818. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= =======
  819. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= =======
  820. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
  821. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= =======
  822. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) =======
  823. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= =======
  824. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= =======
  825. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
  826. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= =======
  827. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) =======
  828. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= =======
  829. =======
  830. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= =======
  831. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6d (Manifest_cache true) ======= ======= ======= ======= =======
  832. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0e (Featire specs) ======= ======= ======= ======= =======
  833. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> d245196 (Manifest_cache true)
  834. <<<<<<< HEAD <<<<<<< HEAD
  835. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 4f4ea3f (Featire specs) ======= >>>>>>> 365d41e (Featire specs) ======= >>>>>>> c05ee51 (Featire specs) <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> d8dd3b4 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= >>>>>>> b28889f (Fix) >>>>>>> 5a2009f (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5a2009f (Fix) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> 4f4ea3f (Featire specs)
  836. ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e5890c2 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6d (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) >>>>>>> 2179316 (Manifest_cache true)
  837. 1 =======
  838. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6d (Manifest_cache true) ======= ======= ======= >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) >>>>>>> 2179316 (Manifest_cache true) >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
  839. 1 >>>>>>> 752f0c0 (Featire specs) =======
  840. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d245196 (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) =======
  841. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) =======
  842. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 9440753 (Featire specs) =======
  843. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= =======
  844. >>>>>>> 183b6c5 (Manifest_cache true) ======= ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= =======
  845. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 9620751 (Featire specs)
  846. =======
  847. >>>>>>> d0dc1f1 (Featire specs) 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= >>>>>>> 8480924 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> d8abfed (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 824bb2b (Featire specs) =======
  848. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 78717cc (Manifest_cache true) ======= ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 98beee2 (Manifest_cache true) ======= ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) =======
  849. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= =======
  850. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= ======= =======
  851. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= =======
  852. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price) ======= ======= =======
  853. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= ======= =======
  854. 1 >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab529 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
  855. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= =======
  856. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= =======
  857. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) =======
  858. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) =======
  859. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c62602 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b4 (Fix) ======= ======= ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6d (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2179316 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0e (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> d245196 (Manifest_cache true) Capybara::Selenium::Driver.new(
  860. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 6e923b9 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> d8abfed (Featire specs)
  861. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bd8bda4 (Manifest_cache true)
  862. =======
  863. >>>>>>> 4e81ea2 (Featire specs) =======
  864. >>>>>>> aa7b40c (Manifest_cache true) =======
  865. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774f (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 4f4ea3f (Featire specs) =======
  866. >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true)
  867. =======
  868. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= =======
  869. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= =======
  870. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= =======
  871. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= =======
  872. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= =======
  873. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= =======
  874. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
  875. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= =======
  876. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) =======
  877. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= =======
  878. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= =======
  879. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= =======
  880. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
  881. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= =======
  882. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) =======
  883. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= =======
  884. =======
  885. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= =======
  886. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6d (Manifest_cache true) ======= ======= ======= ======= =======
  887. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0e (Featire specs) ======= ======= ======= ======= =======
  888. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> d245196 (Manifest_cache true) app,
  889. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= >>>>>>> 6e923b9 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= ======= >>>>>>> d8dd3b4 (Featire specs) ======= >>>>>>> 4f4ea3f (Featire specs) ======= >>>>>>> 365d41e (Featire specs) ======= >>>>>>> c05ee51 (Featire specs) ======= >>>>>>> 251144b (Manifest_cache true) ======= >>>>>>> fc3774f (Featire specs) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD
  890. ======= ======= >>>>>>> 4f4ea3f (Featire specs) ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs)
  891. =======
  892. >>>>>>> d0dc1f1 (Featire specs) =======
  893. >>>>>>> 02a399d (Manifest_cache true) =======
  894. >>>>>>> 752f0c0 (Featire specs) =======
  895. >>>>>>> bd8bda4 (Manifest_cache true) =======
  896. >>>>>>> 4e81ea2 (Featire specs) =======
  897. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= =======
  898. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= =======
  899. >>>>>>> 183b6c5 (Manifest_cache true) =======
  900. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> bf554f4 (Rebased)
  901. <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= ======= ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs)
  902. =======
  903. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= <<<<<<< HEAD ======= =======
  904. >>>>>>> 02a399d (Manifest_cache true) =======
  905. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= =======
  906. >>>>>>> bd8bda4 (Manifest_cache true) =======
  907. >>>>>>> 4e81ea2 (Featire specs) =======
  908. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= ======= ======= =======
  909. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= =======
  910. >>>>>>> 183b6c5 (Manifest_cache true) =======
  911. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true)
  912. <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= =======
  913. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= =======
  914. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) >>>>>>> 0341d6d (Manifest_cache true) browser: :chrome,
  915. <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs)
  916. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs)
  917. =======
  918. >>>>>>> d0dc1f1 (Featire specs) =======
  919. >>>>>>> 02a399d (Manifest_cache true) =======
  920. >>>>>>> 752f0c0 (Featire specs) =======
  921. >>>>>>> bd8bda4 (Manifest_cache true) =======
  922. >>>>>>> 4e81ea2 (Featire specs) =======
  923. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= =======
  924. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= =======
  925. >>>>>>> 183b6c5 (Manifest_cache true) =======
  926. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> bf554f4 (Rebased)
  927. <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= ======= ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs)
  928. ======= ======= ======= >>>>>>> 08edf50 (Featire specs) =======
  929. ======= >>>>>>> 93bdda9 (Featire specs)
  930. >>>>>>> d0dc1f1 (Featire specs) ======= =======
  931. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= =======
  932. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> d782a28 (Manifest_cache true) browser: :chrome,
  933. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> d782a28 (Manifest_cache true)
  934. =======
  935. >>>>>>> d0dc1f1 (Featire specs) =======
  936. >>>>>>> 02a399d (Manifest_cache true) =======
  937. >>>>>>> 752f0c0 (Featire specs) =======
  938. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD http_client: client, ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ) ======= options: options >>>>>>> 752f0c0 (Featire specs) ======= http_client: client, >>>>>>> 4e81ea2 (Featire specs) ======= browser: :chrome, >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs)
  939. >>>>>>> df37394 (Featire specs)
  940. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= <<<<<<< HEAD ======= =======
  941. >>>>>>> 02a399d (Manifest_cache true) =======
  942. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= =======
  943. >>>>>>> bd8bda4 (Manifest_cache true) =======
  944. >>>>>>> 4e81ea2 (Featire specs) =======
  945. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= ======= ======= =======
  946. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= =======
  947. >>>>>>> 183b6c5 (Manifest_cache true) =======
  948. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 9620751 (Featire specs)
  949. <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= =======
  950. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) >>>>>>> 932dbec (Featire specs) >>>>>>> f136376 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) http_client: client, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ) ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ) ======= ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> d8abfed (Featire specs) <<<<<<< HEAD =======
  951. >>>>>>> bf554f4 (Rebased)
  952. <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD =======
  953. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf554f4 (Rebased) ======= <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true)
  954. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= <<<<<<< HEAD >>>>>>> f136376 (Featire specs) =======
  955. >>>>>>> d0dc1f1 (Featire specs) =======
  956. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD =======
  957. >>>>>>> 752f0c0 (Featire specs) =======
  958. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD =======
  959. >>>>>>> 4e81ea2 (Featire specs) =======
  960. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD =======
  961. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= =======
  962. >>>>>>> 183b6c5 (Manifest_cache true) =======
  963. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509ee (Featire specs) ======= >>>>>>> 75fa7e1 (Rebased) ======= >>>>>>> e5890c2 (Manifest_cache true) >>>>>>> 251144b (Manifest_cache true) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= =======
  964. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= <<<<<<< HEAD ======= =======
  965. >>>>>>> 183b6c5 (Manifest_cache true) =======
  966. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= =======
  967. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6d (Manifest_cache true) ======= ======= ======= =======
  968. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0e (Featire specs) ======= ======= ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> d245196 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= ======= >>>>>>> 251144b (Manifest_cache true) ======= ) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) >>>>>>> 251144b (Manifest_cache true) options: options >>>>>>> 752f0c0 (Featire specs) ======= http_client: client, >>>>>>> 4e81ea2 (Featire specs) ======= browser: :chrome, >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= http_client: client, >>>>>>> c033601 (Rebased) ======= options: options ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ) ======= options: options >>>>>>> 4e81ea2 (Featire specs) ======= http_client: client, >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> 4f4ea3f (Featire specs)
  969. <<<<<<< HEAD
  970. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs)
  971. =======
  972. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> 009401d (Featire specs)
  973. >>>>>>> 02a399d (Manifest_cache true) =======
  974. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> c05ee51 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) options: options ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ) ======= options: options >>>>>>> 4e81ea2 (Featire specs) ======= http_client: client, >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs)
  975. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6d (Manifest_cache true) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0e (Featire specs) ======= ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> d245196 (Manifest_cache true)
  976. ======= <<<<<<< HEAD
  977. =======
  978. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD ======= =======
  979. >>>>>>> 02a399d (Manifest_cache true) =======
  980. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= =======
  981. >>>>>>> 4e81ea2 (Featire specs) =======
  982. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) ======= ======= =======
  983. >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= =======
  984. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= =======
  985. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> 8480924 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD
  986. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  987. =======
  988. >>>>>>> d0dc1f1 (Featire specs) =======
  989. >>>>>>> 02a399d (Manifest_cache true) =======
  990. >>>>>>> 752f0c0 (Featire specs) =======
  991. >>>>>>> bd8bda4 (Manifest_cache true) =======
  992. >>>>>>> 4e81ea2 (Featire specs) =======
  993. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= =======
  994. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= =======
  995. >>>>>>> 183b6c5 (Manifest_cache true) =======
  996. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509ee (Featire specs) =======
  997. >>>>>>> 75fa7e1 (Rebased) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) =======
  998. >>>>>>> 183b6c5 (Manifest_cache true) =======
  999. >>>>>>> 7a02bbe (Featire specs) =======
  1000. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c033601 (Rebased) >>>>>>> 4f4ea3f (Featire specs) ) ======= options: options >>>>>>> 08edf50 (Featire specs)
  1001. <<<<<<< HEAD
  1002. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs)
  1003. =======
  1004. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> 009401d (Featire specs)
  1005. >>>>>>> 02a399d (Manifest_cache true) =======
  1006. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> c05ee51 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) ) ======= options: options >>>>>>> 08edf50 (Featire specs)
  1007. <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= )
  1008. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD
  1009. >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD
  1010. >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD
  1011. >>>>>>> 5507b42 (Featire specs) >>>>>>> 932dbec (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) >>>>>>> 13fca83 (Rebased)
  1012. <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD
  1013. >>>>>>> 8480924 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased)
  1014. <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 96aecde (Manifest_cache true)
  1015. =======
  1016. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  1017. >>>>>>> 02a399d (Manifest_cache true) =======
  1018. >>>>>>> 752f0c0 (Featire specs) =======
  1019. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= =======
  1020. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= =======
  1021. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d (Manifest_cache true) ======= ======= =======
  1022. >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= =======
  1023. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
  1024. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= =======
  1025. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) =======
  1026. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= =======
  1027. >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b (Manifest_cache true) ======= ======= ======= ======= =======
  1028. >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= =======
  1029. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
  1030. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= =======
  1031. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) =======
  1032. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= =======
  1033. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6d (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> d245196 (Manifest_cache true) >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) >>>>>>> 4f4ea3f (Featire specs) end

spec/support/configs/shoulda_matcher.rb

100.0% lines covered

5 relevant lines. 5 lines covered and 0 lines missed.
    
  1. 1 Shoulda::Matchers.configure do |config|
  2. 1 config.integrate do |with|
  3. 1 with.test_framework :rspec
  4. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8480924 (Featire specs) ======= >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41e (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> 13fca83 (Rebased) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 1ca9c0e (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 1ca9c0e (Featire specs)
  5. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8480924 (Featire specs)
  6. 1 =======
  7. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  8. >>>>>>> 752f0c0 (Featire specs) =======
  9. >>>>>>> 4e81ea2 (Featire specs) =======
  10. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= =======
  11. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509ee (Featire specs) =======
  12. 1 >>>>>>> 75fa7e1 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 365d41e (Featire specs) ======= >>>>>>> c05ee51 (Featire specs) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 1ca9c0e (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) =======
  13. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> 77d62af (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= =======
  14. >>>>>>> 4e81ea2 (Featire specs) =======
  15. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= =======
  16. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= =======
  17. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41e (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> 13fca83 (Rebased) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 1ca9c0e (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 1ca9c0e (Featire specs) with.library :active_record ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= with.library :active_record ======= <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) with.library :active_record ======= # Keep as many of these lines as are necessary: >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= # Keep as many of these lines as are necessary: >>>>>>> 752f0c0 (Featire specs) ======= # Keep as many of these lines as are necessary: >>>>>>> 4e81ea2 (Featire specs) ======= # Keep as many of these lines as are necessary: >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= # Keep as many of these lines as are necessary: >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509ee (Featire specs) ======= with.library :active_record >>>>>>> 75fa7e1 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 365d41e (Featire specs) ======= >>>>>>> c05ee51 (Featire specs) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 1ca9c0e (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= # Keep as many of these lines as are necessary: >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= # Keep as many of these lines as are necessary: >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= # Keep as many of these lines as are necessary: <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= # Keep as many of these lines as are necessary: >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= # Keep as many of these lines as are necessary: >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= with.library :active_record >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= # Keep as many of these lines as are necessary: >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs)
  18. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 8480924 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 365d41e (Featire specs) ======= >>>>>>> c05ee51 (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> 13fca83 (Rebased) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 1ca9c0e (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs) with.library :active_record
  19. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509ee (Featire specs) ======= >>>>>>> 75fa7e1 (Rebased) ======= ======= >>>>>>> d8dd3b4 (Featire specs) ======= >>>>>>> 365d41e (Featire specs) ======= >>>>>>> c05ee51 (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 1ca9c0e (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs) with.library :active_model
  20. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41e (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> 13fca83 (Rebased) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 1ca9c0e (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 1ca9c0e (Featire specs)
  21. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  22. ======= <<<<<<< HEAD >>>>>>> 8480924 (Featire specs)
  23. =======
  24. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  25. >>>>>>> 752f0c0 (Featire specs) =======
  26. >>>>>>> 4e81ea2 (Featire specs) =======
  27. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= =======
  28. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509ee (Featire specs) =======
  29. >>>>>>> 75fa7e1 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 365d41e (Featire specs) ======= >>>>>>> c05ee51 (Featire specs) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 1ca9c0e (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= =======
  30. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) =======
  31. >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= =======
  32. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
  33. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= =======
  34. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= =======
  35. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= =======
  36. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs) end
  37. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d8dd3b4 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41e (Featire specs) ======= ======= >>>>>>> fc3774f (Featire specs) ======= >>>>>>> d8abfed (Featire specs) ======= >>>>>>> 13fca83 (Rebased) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 1ca9c0e (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 1ca9c0e (Featire specs)
  38. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  39. ======= <<<<<<< HEAD >>>>>>> 8480924 (Featire specs)
  40. =======
  41. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  42. >>>>>>> 752f0c0 (Featire specs) =======
  43. >>>>>>> 4e81ea2 (Featire specs) =======
  44. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= =======
  45. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509ee (Featire specs) =======
  46. >>>>>>> 75fa7e1 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> 365d41e (Featire specs) ======= >>>>>>> c05ee51 (Featire specs) ======= >>>>>>> f136376 (Featire specs) ======= >>>>>>> 1ca9c0e (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= =======
  47. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4 (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) =======
  48. >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41e (Featire specs) ======= ======= ======= =======
  49. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee51 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
  50. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= =======
  51. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= =======
  52. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376 (Featire specs) ======= ======= ======= =======
  53. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> 1ca9c0e (Featire specs) end
<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> f0a057d (Manifest_cache true) ======= >>>>>>> 379e583 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 379e583 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 58c2c0f (Featire specs) ======= ======= >>>>>>> 4f4ea3f (Featire specs) ======= >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 379e583 (Manifest_cache true) >>>>>>> 4d1f738 (Manifest_cache true) ======= ======= >>>>>>> 379e583 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9 (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509ee (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1 (Rebased) ======= ======= >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 8480924 (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 379e583 (Manifest_cache true) >>>>>>> 4d1f738 (Manifest_cache true) ======= ======= >>>>>>> 379e583 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774f (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed (Featire specs) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83 (Rebased) ======= ======= ======= ======= ======= >>>>>>> 379e583 (Manifest_cache true) >>>>>>> 1772e92 (Manifest_cache true) >>>>>>> f0a057d (Manifest_cache true) >>>>>>> 1622d61 (Manifest_cache true) >>>>>>> 9afd7e6 (Manifest_cache true)